Fixed more things, again
Merge branch 'master' of https://github.com/TeamLativa/gamejam14
Merge branch 'master' of https://github.com/TeamLativa/gamejam14
Still changes