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

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

Conflicts:
	infoscreen/index.html