modified:   GreetingText.txt
Merge branch 'master' of https://github.com/sunlife1990/hairy-batman

Conflicts:
	GreetingText.txt

	modified:   GreetingText.txt; merged with pull