stashing changes
asdfasdf
packages
interaction network, to figure out which particles should interact with
each other.
interaction network is all set up, yayyy.
Merge branch 'master' into InteractionDispatching

Conflicts:
	ParticleSim/src/ChargedParticle.java