fixed associations
Merge pull request #3 from andrewcallahan/user-hackathon

fixed associations