Nigel's second change
Another change from Nigel
Merge branch 'master' of https://github.com/wittelw/cs046-problem_set_2