Commit para subir, primera version
Merge https://github.com/tonga298/serpientesyaviones

Conflicts:
	.gitignore