Merge branch 'master' of https://github.com/whaambang/warm_it_up_ember
Merge branch 'master' of https://github.com/whaambang/warm_it_up_ember
readd the clock