updated logo
updated color to match logo
Merge branch 'master' into gh-pages