add sample.txt
Merge remote-tracking branch 'origin2/master'