forget a bullet
Merge branch 'master' of github.com:Theo13/GGJ2014