fixed merge conflicts in seed
models & collections
Merge pull request #19 from Eventalist/theerickramer

Theerickramer