update
Merge branch 'gh-pages' of github.com:kinlane/template into gh-pages