navbar no longer fades on refresh
Merge branch 'gh-pages' of https://github.com/josiah85/GT-T_website into gh-pages

Conflicts:
	js/content.js