Reordered exercises
Merge upstream clashes
Merge branch 'master' into gh-pages