hodor
Merge branch 'master' of https://github.com/Exevan/Labo-OO-Week-1.git

Conflicts:
	Labo OO Week 1/src/ui/WinkelUI.java