ADD: Our grammar is now in proposal.
MERGE: Merge branch 'master' of github.com:izzycecil/Paratype

Conflicts:
	proposal/prop.tex