Working on object model for replicating gamestate.
Merge branch 'master' of https://github.com/alvinlao/charm

Conflicts:
	client/js/entities/gameobject.js
	client/js/entities/player.js
	client/js/game.js