tying up loose ends
Merge branch 'master' of https://github.com/aidankmcl/ExtraHours