Initial commit
Merge branch 'master' of https://github.com/zugort/SS2014-Uni-Bonn