...
Merge branch 'master' of https://github.com/vculibraries/assets

Conflicts:
	public/css/screen.css
	shared/css/base.css
	shared/sass/base.scss