added bcrypt-ruby gem
Updated user model to work with password, updated user controller
Merge branch 'master' of github.com:daynaclowe/DOCTalk
Updated controller
Merge branch 'master' of github.com:daynaclowe/DOCTalk