bcrypt edits
commit cj-phil models. fix user.rb conflict
Merge pull request #4 from lnbcoding/phil-cj

bcrypt edits; fix merge conflict in user.rb