message got eaten by goithub kitty
no message, fuck git
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team2