Bcrypt up and running
Fixed merge conflict in index.rb controller
Merge pull request #8 from alexanderdavidpan/Bcrypt

Implemented bcrypt