First push to heroku
Add seed
Fixed merges