echt wel
Merge branch 'master' of https://github.com/onsjos/vcs-training

Conflicts:
	README.md
Merge branch 'master' of https://github.com/onsjos/vcs-training

Conflicts:
	README.md