commit martes tarde
Merge branch 'master' of https://github.com/Juanjemd/PruebaRepo

Conflicts:
	GitOtroEjemplo/ViewController.m
He elegido el mío