Conflicts:
	GitTest/src/com/gittest/GitTestMain.java