Commiting 1change line from PersonA
Merge origin/master

Conflicts:
	src/mergeproject/MergeProject.java