Generate User model, devise auth, and failing tests
Fix User tests
Resolve merge conflict
Merge branch 'master' of https://github.com/BlackCardWhiteCard/BlackCardWhiteCard