Merge branch 'master' into gh-pages
Experiment with scaling
Removed fixed px widths on area
Page header added
Merge branch 'gh-pages'
Prototype rewrite
Template re-work and test
Merge branch 'gh-pages'