do something
do something else
Merge branch 'master' of https://github.com/kuniman/test-rep-1

Conflicts:
	test-project/src/main/java/cz/kuniman/test/project/Start.java