hello from Effie
terri edits readme
terris edits
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
resolve conflict with upstream