Add line for sharmin in hi.txt
Sharmin made a second change, this time to heyo.txt, at Dave's request.
Merge remote-tracking branch 'upstream/master'

Conflicts:

	hi.txt
Merge pull request #1 from impied/master

Add line for sharmin in hi.txt