fixed all the spelling mathias fucked up
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team2
fixed mathias bad spelling