fixed constructor to take in office
fixed clock
Merge branch 'master' of https://github.com/bcole/SWProjectDay.git