layout overhaul
Merge branch 'gh-pages' of github.com:lizconlan/sandbox into gh-pages