Merge
Merge branch 'master' of https://github.com/stura-hftl/club-monitor
Merge branch 'master' of https://github.com/stura-hftl/club-monitor