first edit
Merge branch 'gh-pages' of github.com:mirrorspock/Scotty into gh-pages