Original file revert
Merge branch 'master' of https://github.com/johnjmartinez/lab2_git

Conflicts:
	MergeConflict.txt