* Maaaaany more views and such
* That one merge.

Conflicts:
	app/models/player.rb