updated seed data for activities to match donor
resolved merge conflicts in database seeder
Merge pull request #55 from andredempsey/andre

updated seed data for activities to match donor