views
updated profile view
views updated for game logic
updated views for game logic
Merge branch 'master' into views

Conflicts:
	app/controllers/index.rb
	app/models/round.rb
updated game, complete merge conflicts
Merge branch 'views'

Conflicts:
	app/controllers/index.rb