user integration test written and passing
integration login test passing bang bang bang
merge conflict
gitignore stuff
moar gitignore
i think i got the gitignore
merge conflicts hopefully last