Gemfile
Make a basic User model (including secure passwords)
resolve origin/master diverge due to Gemfile