Edits.
Merge branch 'master' of https://github.com/ryanmarks/ParticleSorterSim

Conflicts:
	proposal.tex