local commit
Merge branch 'master' of https://github.com/vverhun/testrepo

Conflicts:
	.classpath