Aktuelle Version
Merge branch 'master' of https://github.com/dima888/AD

Conflicts:
	Praktikum/out/production/Praktikum/arrayS.erl