* UMMMMM
* I may have messed with permissions waaaaay too much
* MARGES.

Conflicts:
	app/models/player.rb
	db/schema.rb