Trying to make it work, ignore this
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index

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

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/version.ini