User should be able to login with orasi email or AD credentials.  Also invalid move will display the user's name instead of just the color.
Merge branch 'master' of github.com:LGordon2/code-challenge-grading

Conflicts:
	app/models/user.rb