a
Merge branch 'master' of https://github.com/testgoep/testgoep.git

Conflicts:
	TestGit/src/TestGit2.java
	TestGit/src/TestGit3.java
Merge branch 'master' of https://github.com/testgoep/testgoep.git

Conflicts:
	TestGit/src/TestGit2.java