add a greeting to Georges file
Fix merge conflicts

Conflicts:
	george.txt