test ws 2.2
xxx
Merge branch 'master' of https://github.com/chalupka/test.git

Conflicts:
	GitTest/src/de/test/Test.java