"Tc User #24"
Merge branch 'origin/master'

Conflicts:
	src/test/java/com/ts/main/TestDeLogicaDeNegocios.java