modified:   Gemfile.lock
	modified:   db/schema.rb
fixed wrong commited schema
Merge branch 'master' of https://github.com/New-York-Falcons/orienteering-game into user_auth