deleted pry and bycrypt
Merge branch 'dev'