bcrypt functional
bcrypt functional
resolved merge conflict and bcrypt added
Merge pull request #9 from fence-lizards-2014/bcrypt

Bcrypt