made additional edits to navbar functionality
Merge branch 'master' of https://github.com/Eric-Jr/khi-redesign

Conflicts:
	css/custom.css