Änderung Christopher
Merge branch 'master' of https://github.com/FHMS-WE2-2014/blog