navbar correction
Merge branch 'master' of https://github.com/timsants/CS147-Project

Conflicts:
	views/partials/navbar.handlebars
Merge branch 'master' of https://github.com/timsants/CS147-Project
combined home/course_setup pages, add course functionality on home page, delete class functionality from course:map page