Work on problem 2.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Homework 3/Hw3.doc
Fix problem 2.