Style headers
Little stuff
Merge with jack
Lots of little things
i dunno
IDK EITHER
Merge with jack, fix an s and I don't like trailing slashes

Conflicts:
	admissions/admissions-welcome.html
Merged with Cove and fixed the stuff he messed up