Matze: muss
Merge branch 'master' of https://github.com/Bigtieger/OAdienst

Conflicts:
	bin/main/Main.class
	src/main/Main.java
Merge branch 'master' of https://github.com/Bigtieger/OAdienst