minor changes
Merge branch 'master' of github.com:Onkeliroh/Projekt-SS2013