Commit of README
Files 1 - 3
Change offile 1 and 2
Delete file1
Delete file 3
Rename of file2 and create new file4
Add a new line to file2.txt
Add line on file2 on Masterbranch
Merge branch 'testbranch'

Conflicts:
	src/file2
Again a line addition for file2.txt
Merge branch 'testbranch'
Test
ohoh conflict
Merge branch 'testbranch'

Conflicts:
	src/file2.txt
Merge https://github.com/Kai78/test