Pull request to merge mod3 with master.

Finish second half of 'Week 3'.