Merge branch 'master' into gh-pages
fixed logo size

Signed-off-by: Chris <cdesch@gmail.com>
Merge branch 'gh-pages'