Testing sync to no-mvc branch
git test
Merge branch 'no-mvc'

Conflicts:
	tests/test_player.rb