Fourth Commit
fifth commit
Sixth commit
seventh commit in feature2
eigth commit into feature2
ninth commit
Merge branch 'feature2'

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