oh
implement user sign up and sign in
seed database
resolve conflicts for merge with master
merge and resolve conflicts