some stuff
Merge branch 'master' of github.com:martinmeinke/Studienarbeit_Ocelot