whatever
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Fixed several wire related bugs, as well as another bug when trying to analyse a circuit