Show files working.
Merge branch 'current-sprint' of github.com:prisms-center/materialscommons.org into current-sprint

Conflicts:
	website/app/application/core/projects/overview/overview.html
	website/app/index.html
	website/app/style-3.css
Merge branch 'current-sprint' of github.com:prisms-center/materialscommons.org into current-sprint