new website layout
new site look
Merge branch 'master' into gh-pages