Fehlende NullPointer Behandlung engefuegt
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge remote-tracking branch 'origin/master'