line 3 has been editted
natasja veranderd branch
fixed merge conflict
added txt to line 5
regel oplossen
iets
Merge branch 'master' of https://github.com/Natasjaminor/Spitsuur
Even testen
changed test.txt
Merge branch 'master' of https://github.com/Natasjaminor/Spitsuur

Conflicts:
	branchetest.txt
Merge branch 'master' of https://github.com/Natasjaminor/Spitsuur
line added
Merge branch 'yasmina'
removed branchetest.txt