test
Merge branch 'master' of https://github.com/KIT-IPE/Kitcube-Status
Merge branch 'master' into develop

Signed-off-by: Nicholas Tan Jerome <nicholastanjerome@gmail.com>

Conflicts:
	.gitignore
	kitcube/mainscreen/templates/mainscreen/index.html