Pre chapter 7
Finish uer signup
Merge branch 'sign-up'