Conflict solved
Conflict solved
Merge branch 'Conflict-wiebe' of https://github.com/wrvangeest/Context into Conflict-wiebe
Merge remote-tracking branch 'origin/Conflict-wiebe'

Conflicts:
	Testvanwiebe.txt
Merge branch 'master' of https://github.com/wrvangeest/Context