finished user tests
user specs finished
merge conflict in test logs
Merge pull request #5 from JYoung217/model-test-user-assoc

Model test user assoc