Fixed it all except that one thing
Merge branch 'master' of https://github.com/bstalcup/summergame

Conflicts:
	spritesheet.lua