nearly have associations working
Merge pull request #2 from jcward10/erins-branch

nearly have associations working