"Estabilizacion de los tc"
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/Colon.java
	src/test/java/com/ts/main/Comandos.java