max war hier
Merge branch 'master' of https://github.com/SanWade/DBS-Projekt

Conflicts:
	Blup.txt