second draft hfile chapter sent to Bill
Merge branch 'master' into hfile

Conflicts:
	.aspell.en.prepl
	.aspell.en.pws
	thesis.bib
	thesis.tex