Testing
Merge branch 'gh-pages' of https://github.com/eimpec/tedxstrath into gh-pages