Updated seeds
resolved conflicts with master
fixed some seed stuff, added names
Merge branch 'david' of https://github.com/ysshah/Project2 into thomas

* 'david' of https://github.com/ysshah/Project2:
  Updated seeds
changed seeds, added linked to Users, will continue working
Merge pull request #22 from ysshah/thomas

Thomas