made a change
made another change
Gemerged, na oplossen van conflict in twee.txt tgv de master
Merge branch 'testing'

Conflicts:
	twee.txt
dit is versie 1.3
this is the message