Update to the latest version.
Merge branch 'master' of https://github.com/marcusnygren/Elements

Conflicts:
	Proposal/proposal.tex