useless
Merge branch 'master' of https://github.com/JanaWengenroth/GKA1

Conflicts:
	Doku.odt