Make basic user model, including authentication via has_secure_password
Merge branch 'dev'