Office hours

Merged Adam Caprez requested to merge office-hours into master

Merge request reports