Tweede verandering

Erg handig
Merge remote-tracking branch 'origin/master'

Conflicts:
	hallo.txt