gh
s
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
actualizado
Merge branch 'master' of https://github.com/Itadaki/pruebaGit

Conflicts:
	.gitignore