commit after adding goodbye and upstream merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hello-eclipse.c