add .gitignore file
Merge branch 'master' of https://github.com/qingyin/test1
Merge remote-tracking branch 'origin/master'
test conflect
Merge branch 'master' of https://github.com/qingyin/test1
test 3