Added colors for players area
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

Conflicts:
	public/js/controllers/game.js
Removed avatars from game controller
Merge branch 'master' of https://github.com/cardsforhumanity/cardsforhumanity

Conflicts:
	public/views/player.html
Merge pull request #48 from davegonzalez/master

Request the pulls