revised
bits and pieces
Merge branch 'master' of https://github.com/danielsf/DOE_1306

Conflicts:
	doe_proposal_1306.tex