resolved error?
Merge branch 'master' of github.com:ryanmarks/ParticleSorterSim

Conflicts:
	proposal.tex