Merge branch 'master' of https://github.com/simon-paris/deco3801-primate

Conflicts:
	src/css/style.css
	src/ui.js
fix conflicts