m > d transition overhaul
Merge branch 'master' of https://github.com/VCUarts/VCUarts-AFO-2014

Conflicts:
	library/css/style.css