changed nav bar colors
Merge remote-tracking branch 'origin/master'
changed nav bar colors