David Bernadett -- Testing Point Charges
Merge branch 'master' of https://github.com/NU-STEM/Windows-APP-E-M.git

Conflicts:
	SpinUpAndroid/src/MainGamePanel/MainGamePanel.java