replaced gemfile again, now working. Log-in implemented
user login
Merge pull request #1 from mdrewt/user

User