Adding associations
Assoc added
Merge branch 'master' into add_associations
Merge branch 'master' of github.com:BLNorris/project-rails
Merge branch 'master' of github.com:BLNorris/project-rails