Add base layout
Merge branch 'master' into gh-pages
Updating to base layout