Create hello3.txt
Delete hello3.txt
Merge pull request #2 from torataro/patch-1

Patch 1
Update hello2.txt
update for conflict