some updates
some updates
Merge branch 'master' of https://github.com/kberger/serpent

Conflicts:
	final_paper.pdf
	final_paper.tex
Merge branch 'master' of https://github.com/kberger/serpent
final version?
Merge branch 'master' of https://github.com/kberger/serpent