combining master and gh-pages branches #3

Closed selwyth closed 9 years ago