Merge branch 'gh-pages'
Make public page + about page
Merge branch 'master' into gh-pages