Merge remote-tracking branch 'origin/master'
jkl
gk
Merge branch 'master' of https://github.com/metometo/testRepository1.git

Conflicts:
	src/testRepository1/a.java