deleted test print statement
committing something for no reason
Merge https://github.com/bohmbac1/RobotBattle into develop
Merge branch 'develop' of https://github.com/bohmbac1/RobotBattle into develop

Conflicts:
	src/simulation/BlowtorchSimulation.java
	src/simulation/ChainsawSimulation.java
	src/simulation/ElectricFieldSimulation.java
	src/simulation/TwoRobotSimulation.java
gui almost done