Fix hour display
Merge branch 'master' of https://github.com/BartKrol/GlasgowHackathon