2nd to last Saturday commit
Merge branch 'master' of https://github.com/tronster/ggj2014