Added bcrypt-ruby
Fixing merge issues
Fixing merging issues