v6
Merge branch 'master' of https://github.com/michbukana/test123.git

Conflicts:
	testGIT/src/sss.java