Merge branch 'master' of
https://github.com/schweinebaer/Trainigsplan.git
Merge branch 'master' of
https://github.com/schweinebaer/Trainigsplan.git