Fixed FAV border
Merge branch 'master' of https://github.com/micahmicah/academics

Conflicts:
	css/style.css