Merge pull request #6 from brandonmanson/assoc_and_seed

Assoc and seed
add user feature tests for signup
add feature tests for user edit page
Merge pull request #7 from brandonmanson/user-feature-tests

User feature tests
seed file done, gemfile and spec files updated
User model and Gemfile merge conflicts resolved