work1
resolve conflict
work1 commit
Merge branch 'master' of github.com:qtang3/test
merge
Merge pull request #1 from qtang3/work1

Work1