lars commit new
Merge branch 'master' of https://github.com/andekol/gruppe16_kalender