wums
Merge branch 'master' of http://github.com/TimoBockelmann/gitworkshop

Conflicts:
	mytest.txt