asdfasdf
Merge branch 'master' into InteractionDispatching

Conflicts:
	ParticleSim/src/ChargedParticle.java