Merge pull request #4 from alanflorendo/seed

Seed
fix merge conflicts