Seed application
fix merge conflicts
Merge pull request #9 from bumblebees-2014/seeding

Seeding