Create hello3.txt
Delete hello3.txt
Update hello2.txt
Merge branch 'gacco/master' of https://github.com/torataro/test-app into gacco/master
update gacco/master
Merge pull request #2 from torataro/patch-1

Patch 1
Update hello2.txt
update for conflict
conflict
Merge pull request #3 from torataro/gacco/master

Gacco/master