changes
Merge branch 'master' of https://github.com/MeilinM/Research-Project-Assignment-3

Conflicts:
	MergedData