Added file1
Merge branch 'master' of github.com:d-tsui/branch-test
Merge pull request #1 from d-tsui/master

get derek's file from master