changed a new line
Merge branch 'fromgithub' into fromlocal

Conflicts:
	greeting