Sign up

merge user sign-up into master