Final Commit
Merge branch 'master' of https://github.com/michaeldorner/Softcomputing

Conflicts:
	2_Studienarbeit/studienarbeit.pdf
	3_Präsentation/präsentation.pdf