Add User migration, controller, and model.

Fix merge conflicts