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

Conflicts:
	.gitignore
	LogicTec/src/logictec/LogicTec.java