Merge branch 'master' of https://github.com/rvnijnatten/OOP2

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/GUI Practise/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Galgje/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Week 1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
	.metadata/.plugins/org.eclipse.recommenders.completion.rcp.calls/call-models-0.5.json
	.metadata/.plugins/org.eclipse.recommenders.completion.rcp.overrides/ovrm-models-0.1.json
	.metadata/.plugins/org.eclipse.recommenders.rcp/repository/jre/jre/1.0.0/_maven.repositories
	.metadata/.plugins/org.eclipse.recommenders.rcp/repository/jre/jre/resolver-status.properties
	.metadata/.plugins/org.eclipse.recommenders.rcp/repository/org/eclipse/recommenders/index/0.0.0/_maven.repositories
	.metadata/.plugins/org.eclipse.recommenders.rcp/v0.5-package-root-infos.json
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml