Problem 2 Writeup Update 3
Merge branch 'master' of https://github.com/cjpatton/256

Conflicts:
	ps3/HwkIII.tex