Recompile for merger.
Merge branch 'master' of ssh://github.com/ohearnk/CS343

Conflicts:
	projects/term_paper/paper.pdf