Fixed nav in main
Merge branch 'master' of https://github.com/alin72/CSE-308

Conflicts:
	src/main/help.html
	src/main/index.html
	src/main/register.html
	src/main/search.html
	src/main/viewcategory.html
Merge branch 'master' of https://github.com/alin72/CSE-308

Conflicts:
	src/main/help.html
	src/main/index.html
	src/main/register.html
	src/main/search.html
	src/main/viewcategory.html