Cleaned up warnings
Merge branch 'master' of https://github.com/HollowDev/GGJ2014