3rd row deleted
Merge branch 'master' of https://github.com/reisners/try_git.git

Conflicts:
	umltest/test.txt
bla