Pregunta 27
Merge remote-tracking branch 'remotes/origin/HEAD'

Conflicts:
	docs/respuestas.txt
Merge remote-tracking branch 'remotes/origin/bentor'
cambios
Merge branch 'master' of github.com:alu0100136296/prct03

Conflicts:
	docs/respuestas.txt
Merge branch 'master' of github.com:alu0100136296/prct03

Conflicts:
	docs/respuestas.txt