Style headers
Dunno
Merge remote-tracking branch 'cove/master'
Little stuff
Merge with jack
Lots of little things
i dunno
IDK
IDK EITHER
Merge with jack, fix an s and I don't like trailing slashes

Conflicts:
	admissions/admissions-welcome.html
Switched Admissions Inquiry Form to Wufoo
Merged with Cove and fixed the stuff he messed up
Wow
Fixed link
Fixed logo
Dunno
Merge remote-tracking branch 'cove/master'
Who KNows
Merge with jack and fixed a link
IDK
Merge remote-tracking branch 'jack/master'