associations fixed
fixes merge conflicts
Merge pull request #5 from nullet/testing-comments-appts

Testing comments appts