Änderung von SomeProject ;-))))
Merge branch 'master' of https://github.com/artur1985/testrepo

Conflicts:
	JapJap2.txt
NOCHMA
Merge branch 'master' of https://github.com/artur1985/testrepo