Agregando ViewController
Merge branch 'master' of https://github.com/DankarSilob/hola2

Conflicts:
	hola.xcodeproj/project.pbxproj