Updated file1.txt
Merged branch.
Merge branch 'master' of github.com:hiro-iFactory/test
Updated file1.txt