act
act
act Merge branch 'master' of github.com:EmiSancho/LogicTEC

Conflicts:
	LogicTec/src/Logic/Circuito.java
	LogicTec/src/Logic/Component.java