Merge branch 'final' of github.com:aarongut/cdb into final

Conflicts:
	final/final.pdf
	final/final.tex
	final/final.tex.project.vim
This commit is contained in:
2015-05-06 15:45:57 -04:00
7 changed files with 78 additions and 19 deletions

Binary file not shown.