Working maybe?
Merge branch 'master' of https://github.com/laumer15/NMIX-NewMedia-Redesign

Conflicts:
	css/NMIXindex.html
Lauren's here!