section 5
merge conflicts
Merge branch 'master' of https://github.com/danielsf/DOE_1306

Conflicts:
	doe_proposal_1306.tex
section 5 and others
Merge branch 'master' of https://github.com/danielsf/DOE_130a7

Conflicts:
	doe_proposal_1306.tex