minor change prior to submission
Merge branch 'master' of https://github.com/endario/thesis

Conflicts:
	thesis.loa
	thesis.pdf