can log in with username or email
Merge branch 'master' of https://github.com/enylund/project1