By: Michael Lynch <git@mtlynch.io>
Merge branch 'master' into email-auth # Conflicts: # cmd/app/main.go # handlers/auth_service.go # handlers/login.go # handlers/login_test.go