Created some bugs, not much else
Merge branch 'master' of https://github.com/jimmytheleaf/game-jolt-10