seed file done, gemfile and spec files updated
User model and Gemfile merge conflicts resolved
Merge pull request #8 from brandonmanson/assoc_and_seed

Assoc and seed