-Removed several errors, and several hundred warnings, deprecated method usage, other stuff
Merge branch 'master' of https://github.com/Krb686/circuit-simulator

Conflicts:
	src/CirSim.java