changes made to the associations and the erd
Merge pull request #7 from dan987/change_erd3

changes made to the associations and the erd