bcrypt
Merge branch 'layout'
removed database from master