Eating sort of works
Merge branch 'master' of https://github.com/BordenJardine/gamedev8

Conflicts:
	lib/game/main.js
Cleaning up before beginning work on ubervelt
Merge branch 'master' of https://github.com/BordenJardine/gamedev8