can't recall what these changes are
Merge branch 'master' of https://github.com/botheredbybees/d0x3d-the-game

Conflicts:
	html/app/scripts/main.js