test conflicts
Merge branch 'master' of https://github.com/Krill/test-merge.git

Conflicts:
	src/Test.java