navigation working
Merge branch 'master' of https://github.com/IvanMalison/HackathonPortal

Conflicts:
	hackathon_portal/templates/base.html