#13, add missing associations, apply conventions
Merge branch 'master' of github.com:elpassion/vielen_games

Conflicts:
	app/models/player.rb