isome changes to proposal
Merge branch 'master' of https://github.com/txa/alex-new

Conflicts:
	proposal.tex