Switch to homework 7.
Merge branch 'master' into deploy-test