afsluiten
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/be/howest/groep5/breakout/view/welcome/ButtonPanel.java
Merge remote-tracking branch 'origin/master'
afsluiten button