Adds bcrypt stuff to environment, gemfile, controller, model; adds new migration to update password col to password_hash
Merge branch 'master' of https://github.com/growthcode/Tweet_of_Thrones into Jessica
Adds users page ravens, fixed some css
Fixed merge conflict
Merge pull request #11 from growthcode/Jessica

Jessica