first commit
jakobs branch by simon
hallo.txt added
giiiitt
Merge branch 'test' into HEAD

Conflicts:
	test123.txt