Metadatakram?
Merge branch 'master' of https://github.com/zian92/InfoGrundlagen

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Blatt 4/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Blatt 4/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.jdt.core/1825499964.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt