thomas
Merge branch 'master' of https://github.com/TimoBockelmann/gitworkshop

Conflicts:
	mytest.txt