changed score format
update
resolve merge conflict on picking a deck

Merge branch 'master' into user_management

Conflicts:
	app/views/user.erb
Merge pull request #5 from GeoffCrittenden/user_management

User management