creates models and migrations
adds associations
adds seed data
Customizes devise views with user name
Fixes merge conflict