aoeu
Merge branch 'master' of https://github.com/Helldevastator/MAGB.git

Conflicts:
	src/Uebungen.java