Merge branch 'master' into gh-pages
tiny stop sign
Merge branch 'gh-pages'
Merge branch 'master' of https://github.com/beesandtrees/disco