conflict resolved

Conflicts:
	Test_Proj/src/Main.java