Editor has selectable classes and almost objects
Merge branch 'master' of github.com:Leterren/senior_project

Conflicts:
	lib/game.rb
	objects/player.rb