ffffffffffffffffffffffffffffffff
Merge branch 'feature_kaho'
Merge branch 'master' of https://github.com/mstusek/gitschulung