Moar fixes
Merge branch 'master' of https://github.com/ssfilipov/LampreyThree

Conflicts:
	src/test/java/eel/seprphase2/Simulator/ConnectionTest.java
	src/test/java/eel/seprphase2/Simulator/FuelPileTest.java