minor changes
Merge branch 'master' of https://github.com/TNRIS/site-mockup

Conflicts:
	templates/partials/navbar.html