resolved see conflicts
add travis badge to readme
Merge pull request #1 from wanderluster/seed-conflict

Seed conflict