Merge branch 'gh-pages'
added proto of new design
Merge branch 'master' into gh-pages