Añadida pregunta para GitHub.
Merge branch 'master' of https://github.com/L4D15/Test

Conflicts:
	Hola.txt