Implemented login
Added password for users (and accompanying bcrypt gem)
Merge branch 'routes_conts'
Resolved Gemfile conflict
removed gemfile.lock file from git
Modified gitignore
Modified Gemfile"
Merge branch 'master' of https://github.com/Stephenitis/footprint
Fixing gem
Gemfile lock shit