removed annoying jshint
Merge branch 'dev' of https://github.com/LunaPg/gamejam1311 into dev