associations complete
fix merge conflicts in migrations
Merge pull request #4 from ryanhburbank/make_associations

associations complete