modded gemfile and model to add bcrypt
Merge branch 'user_migration'