blalbal
hallo döer
Merge remote-tracking branch 'origin/gui'

Conflicts:
	src/gui/Main.java
Merge branch 'master' of https://github.com/Aljechin/Studienprojekt
1
Merge branch 'gui'
gui merge