after changing bug with seed data
Merge branch 'master' of https://git.heroku.com/ancient-plateau-7188