finish user signup
Add SSL to production
Clean up tests
Finish sign in
fixed conflict