Working on game state flow and added some pretties to the player object.
Merge branch 'master' of https://github.com/alvinlao/charm

Conflicts:
	client/js/entities/player.js