Merge pull request #1 from JonahMoses/staging

Staging
Merge branch 'master' of github.com:JonahMoses/fourth_meal
Merge branch 'staging'
Merge branch 'staging'
adjusted seed data
changed seed file back to 'active'