Pull Request to merge Emily's fork and numberline work into the Master branch.

All merges successful.