Added Label with the text 'Hi World :)'
Merge branch 'master' of https://github.com/kbacalso/HiWorld

Conflicts:
	HiWorld/en.lproj/ViewController.xib