small things
small things
Merge branch 'master' of https://github.com/isobelojalvo/uwthesis

Conflicts:
	HadronicCalorimeter.tex
Merge branch 'master' of https://github.com/isobelojalvo/uwthesis