Reordered exercises
Merge upstream clashes