Cambios Test

Un test de git
Test2
Merge branch 'master' of https://github.com/hpcuvi/Prueba

Conflicts:
	Prueba/ViewController.m
Merge branch 'master' of https://github.com/hpcuvi/Prueba
Merge branch 'master' of https://github.com/hpcuvi/Prueba
test 3
Merge branch 'master' of https://github.com/hpcuvi/Prueba
test 4
test 5
test 6
Merge branch 'master' of https://github.com/hpcuvi/Prueba

Conflicts:
	Prueba/ViewController.m