added changes that WERE NOT MADE
COMPLETELY UNNECESSARY merge
Merge branch 'master' of github.com:keflavich/thesis

Conflicts:
	ch_h2colarge.tex
	thesis.pdf
Merge branch 'master' of github.com:keflavich/thesis