navbar color changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Styles/index.css