New template
Merge branch 'master' of https://github.com/sunnyjuicedrink/zeitplanner
Merge branch 'master' of https://github.com/sunnyjuicedrink/zeitplanner