Updated Presentation
Merge branch 'master' of https://github.com/cjpatton/256

Conflicts:
	proj/presentation.tex
Merge branch 'master' of https://github.com/cjpatton/256