Clocks!
Merge branch 'master' of https://github.com/Broxxar/egj_first_time