commit 9
Merge branch 'mirror' of https://github.com/stono888/gitTest.git into
mirror

Conflicts:
	src/com/srie/test/TestGit.java