...
Merge branch 'master' of https://github.com/nataliia4/javaBasic.git

Conflicts:
	Aufgaben/.settings/org.eclipse.core.resources.prefs
.
neu