finish signup
Merge branch 'signup'

finished signup