Merge branch 'master' of https://github.com/informaticslab/apollo

Conflicts:
	src/public/css/custom.css
Override custom.css with Sarah's latest version