sync stuff
test

Conflicts:
	Digital Circuit/FormDigitalCircuit.resx