Minor changes 1
Merge github.com:princeedward/senior_thesis

Conflicts:
	Tex/body/chapter2.tex
	Tex/diss.pdf