CSS

css tweaks
Merge branch 'master' of https://github.com/micahmicah/academics

Conflicts:
	architecture/index.html
css

css merge