finished relationships
Merge pull request #27 from KristaANelson/finish_relationships

finished relationships
fixed_merge_conflicts_from_individual_relationships