Soso
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fallstudie/src/GUI/GUI.java
Merge branch 'master' of https://github.com/Terheiden/Fallstudie.git