Merge branch 'Zweig_A' of https://github.com/alexsee/se-1314-2a
Merge branch 'master' of https://github.com/alexsee/se-1314-2a