Remove accidentally adding a new table to schema after horrible rails 4 hash syntax update
Merge branch 'master' into player

Conflicts:
	db/schema.rb