shitty
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb
Modified Game Controller added history entry support