Pull time
Merge branch 'master' of https://github.com/Epiphane/GGJ2014
Last state skeleton
Fixed merge