N
aMerge branch 'master' of github.com:EmiSancho/LogicTEC

Conflicts:
	LogicTec/nbproject/project.properties