Added user creation
Merge branches 'master' and 'sign-up'