Bug fixes, voltmeter now gets voltage from component
Voltmeter mostly working
Merged branch 'tools' and fixed conflicts
Conflicts:
	src/main/java/edu/asu/voctec/GUI/ToolComponent.java
	src/main/java/edu/asu/voctec/components/LoadWire.java
	src/main/java/edu/asu/voctec/scenario_1/MainScreen.java
Fixed testing bug
Merge branch 'tools'
Bug fixes to visual items and null pointer on Hard