finished office hours
Merge branch 'chris'