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

Conflicts:
	umltest/test.txt
Merge branch 'master' of https://github.com/reisners/try_git

Conflicts:
	umltest/test.txt
added