Login system up and running
Merge branch 'user-logins'

* user-logins:
  Login system up and running

Conflicts:
	app/views/game/show.html.erb