Cleanup of the master branch after moving stuff over to homework branch.