a few small things
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus

Conflicts:
	controllers/default.py