stuff
Aststst
stuff
Merge branch 'master' of https://github.com/joshrouwhorst/Tag

Conflicts:
	client/js/Game.js
	server/GameState.js