Make a basic User model
Finish user signup
Merge with feature/users branch and resolve merge conflicts.