navbar css
Merge branch 'master' of https://github.com/nbcormier/victory

Conflicts:
	includes/css/china-no-1.css