Small changes
Merge branch 'master' of https://github.com/CamelBackNotation/gamejam
Merge branch 'master' of https://github.com/CamelBackNotation/gamejam
This is the best version we have so far. Revert here if we fuck up