added usr controller
Added new_round and usrpage views
--the new_round view is the view the user sees once they have selected a deck but before they have committed to playing a new game
--the usrpage view is the view a user sees after they have logged in: giving them the option to start a new round (will add create a new deck later)
Merge branch 'master' into ron_add_views
resolved merge conflicts. nothing major.

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