equity stuff
submitted version
pushed Cynthia's changes
Allow modifications
Merge remote-tracking branch 'upstream/master'

Conflicts:
	potential_outcomes.txt
	problem_identification.txt
	progress_to_date.txt
	rational_and_motivation.txt
	research_activities.txt
	research_aims.txt
	research_approaches.txt
modified to address merge conflicts.