Merge branch 'master' into gh-pages
redesign
Merge branch 'gh-pages' of https://github.com/shavarb/frontpage into gh-pages