This should be alright now
Merge branch 'master' of https://github.com/madevr/fallstudie.git