change nav bar
Merge branch 'master' of https://github.com/atogata/cse463

Conflicts:
	css/mainpage.css