navbar color updated
Merge branch 'master' into william
day push and pull
Merge branch 'master' into william
Merge pull request #21 from areveal/william

William