gemfile updates, basic user login
Merge branch 'master' of https://github.com/amdixon/atlas_app