Switch to fifth homework assignment.
Merge branch 'master' into deploy-local