intro
avoid compile error
merge
Merge branch 'master' of github.com:nschneid/mwesst-task

Conflicts:
	proposal/proposal.tex