Merge branch 'gh-pages'
logo and new page
long one page
popsicle logo