don't judge me
Merge branch 'master' of https://github.com/Roborovskis/Science-Fair

Conflicts:
	client/js/focusSystem.js