end and start
Merge branch 'master' of https://github.com/Daiwen/ludum-08-2014