hihi
Merge branch 'master' of https://github.com/gvx/git-workshop

Conflicts:
	lijst.txt
Merge branch 'master' of https://github.com/gvx/git-workshop

Conflicts:
	lijst.txt
gefixed (alweer)