deleted seed files that didn't need to be there.
fixed merge conflict in shcools controller.
fixed a typo.
Merge pull request #62 from devdame/merging_dannys_changes

Merging dannys changes