stuff
Merge branch 'master' into network

Conflicts:
	public/src/game.js
stuffs
moar stuffs