changes
Merge branch 'master' of github.com:Plummat/gaprojecttwo

Conflicts:
	app/controllers/main_controller.rb
merge
Merge branch 'master' of github.com:Plummat/gaprojecttwo
Working on the player... fuckin' JS...
pull and indent