fix merge conflict for migration and also add bcrypt-ruby gem
Merge pull request #9 from georgexzeng/master

fix merge conflict for migration and also add bcrypt-ruby gem