Chao
Merge branch 'master' of https://github.com/hpcuvi/Prueba

Conflicts:
	Prueba/ViewController.m