First
Merge branch 'master' of github.com:dsandstrom/bcrypt_test