added some zoidberg
Merge branch 'max' of https://github.com/ON4R/Studienarbeit-SS13 into stefan