deleted bcrypt and added devise
merge
Merge branch 'registration3'