Random Stuff, no idea what I'm doing
Merge branch 'master' of https://github.com/CerealBuster/Prog1

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

.metadata/.plugins/org.eclipse.core.resources/.projects/06_Praktikum-2_B
efehlssystem/.location

.metadata/.plugins/org.eclipse.core.resources/.projects/06_Praktikum-2_B
efehlssystem/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/06_Praktikum-2_B
efehlssystem/.syncinfo.snap

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

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

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

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.c
ore.prefs

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

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

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

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.
tasks.ui.prefs
	.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.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/version.ini