push
Merge branch 'master' of https://github.com/imperatief/Opdracht4

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/imperatief/Opdracht4

Conflicts:
	main.cpp
merge?