reformat initial nav bar
resolved conflict
Merge branch 'MuWahLee-responsive_nav'

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'MuWahLee-responsive_nav2'