some changes?
Merge branch 'master' of https://github.com/josh-kaplan/integrateu.dev
Merge branch 'master' of https://github.com/josh-kaplan/integrateu.dev
Merge branch 'master' of https://github.com/josh-kaplan/integrateu.dev
Merge branch 'master' of https://github.com/josh-kaplan/integrateu.dev
login View, error message cleanup
Merge branch 'master' of https://github.com/josh-kaplan/integrateu.dev