"hola"
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/interprete/Parser.java
	src/main/java/com/ts/interprete/Token.java
	src/main/java/com/ts/libraries/Boolean.java
	src/main/java/com/ts/libraries/Colaborador.java
	src/main/java/com/ts/libraries/Colon.java
	src/main/java/com/ts/libraries/CommandException.java
	src/test/java/com/ts/interprete/ParseTest.java