game is now function
Merge pull request #3 from GeoffCrittenden/user_management

User management
almost done
JUst checking git performance

Merge branch 'master' into initial_backend
Merge pull request #4 from GeoffCrittenden/initial_backend

Initial backend
update
resolve merge conflict on picking a deck

Merge branch 'master' into user_management

Conflicts:
	app/views/user.erb