bcrypt is working now
wtf
Merge origin/master