Pull request to merge mod3 with master.

Code review for the middle of "Week 3"