Fix and use stuff
Merge branch 'master' of github.com:celeron55/ggj14