test commit
Merge branch 'master' of https://github.com/cledyulate/testCledy

Conflicts:
	text.txt
x
Merge pull request #1 from jcabarca/master

Merging test de jose