NEW CHANGES
Merge branch 'master' of https://github.com/akyle9/MatterAndInteractionsIProject

Conflicts:
	dataFile.txt
Merge branch 'master' of https://github.com/akyle9/MatterAndInteractionsIProject