Finish user signup
Merge branch 'users'