not sure what
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip

	.metadata/.plugins/org.eclipse.core.resources/.projects/minuprojekt/.indexes/e4/b2/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/minuprojekt/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/minuprojekt/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/4261504317.index
	.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache
	.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	.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/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/version.ini
	.recommenders/caches/identified-project-coordinates.json

	.recommenders/repository/http___download_eclipse_org_recommenders_models_luna_/jre/jre/1.0.0-SNAPSHOT/resolver-status.properties