changed method name 'getGreeting' to 'showGreeting'
Merge branch 'master' of https://github.com/kbacalso/HiWorld

Conflicts:
	HiWorld/ViewController.m