ran db:migrate
Fixed merge conflicts
Merge branch 'master' of github.com:eabrawer/Maven-Application