Problem set 3 is not yet completed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	scratchpad.py