Delete test file
test
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	Nuevo documento de texto.txt