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

Conflicts:
	public/js/splash-pages/tml/head.js