added hi in test1.txt
Merge branch 'feature1' of github.com:sontek/test_github_bug into feature2