merge error
Merge branch 'master' of http://github.com/ValerieEskens/trygit

Conflicts:
	sub2/tester.txt