fix conflict issue
Merge branch 'dev' of https://github.com/davidjohnwoolf/patchatech into dev
fix typo sign_up -> sign in
delete un needed registrations test file
Merge branch 'dev' of https://github.com/davidjohnwoolf/patchatech into dev
Merge branch 'dev' of https://github.com/davidjohnwoolf/patchatech into dev