proposal for project
proposal tweaks
Merge branch 'master' into balance_lightest

Conflicts:
	project/doc/proposal/paper.tex