Commiting change to the line 1change
Merge origin/master

Conflicts:
	src/mergeproject/MergeProject.java