seed files are pulling from amazon
merge conflicts
Merge pull request #66 from glenegbert/glens_branch

Glens branch