Fixed stuff I broke
Merge branch 'master' of https://github.com/Frostlag/GJ
Merge branch 'master' of https://github.com/Frostlag/GJ