initial commit of my project
made a change
made other changes
row 2 added
row 4 added (datei2.txt) [iss53]
fixed the row 2
finished the row 4 (datei2.txt) [iss53]
Merge branch 'iss53'

Conflicts:
	datei2.txt
fixed datei3.txt (row 4 added) [fix2]
datei4.txt completed
Merge branch 'fix2'

Conflicts:
	datei3.txt
completed datei1.text [new_fix]
datei3.txt completed [fix2]
Merge branch 'fix2'

Conflicts:
	datei3.txt
datei1.txt completed [hotfix2]
datei2.txt completed [testing]
Merge branch 'testing'

Conflicts:
	datei1.txt
	datei2.txt
datei2.txt changed [feature1]
datei2.txt fixed [hotfix2]
datei2.txt: feature1 finished