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

Conflicts:
	Nuevo documento de texto.txt
Merge remote-tracking branch 'remotes/origin/develop'
First change
Merge remote-tracking branch 'remotes/origin/master' into develop