Merge branch 'master' of https://github.com/dean13-meet/Electric-Field-Mapping

Conflicts:
	src/Main/editBallDisplay.java
	src/Main/initialDisplay.java