pulling latest
Model tests and relationships complete
Model tests and relationships complete
Merge branch 'master' into add_remaining_associations
Merge pull request #15 from sjafri5/add_remaining_associations

Add remaining associations