Update migration, add sign_up methods to user #18
Fix my own conflict