Adding changes to handle basic game intro
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/index.rb
Placeholder commit to pull Dinesh's changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/index.rb
	app/views/game.erb