extended 2
some other commit
Merge branch 'master' of https://github.com/Iwaneez/J2EE-test.git

Conflicts:
	Git Test/src/org/iwaneez/git/first/GitTest.java