update
Merge branch 'master' of https://github.com/delcmo/Preliminary-exam

Conflicts:
	Proposal.aux
	Proposal.log
	Proposal.pdf
	Proposal.synctex.gz