added office hours to new syllabuses
Merge branch 'master' of https://github.com/gwillad/syllabest
fixing merge conflict