Please merge in the changes from my master branch.

...core curriculum