further work on tex doc
Merge branch 'master' of git://github.com/jfmrothe/AST523project

Conflicts:
	docs/tex/GrecoRothe_MultiNest.pdf
	docs/tex/GrecoRothe_MultiNest.tex
-- actually, I'm just pushing my work on these two files...