Merge branch 'master' into gh-pages
Adding "erasmus" quote
Merge branch 'gh-pages'