This is the first git project
Version 0.02
This is a branch
add welcome msg
fix conflict
Merge branch 'master' of github.com:hellove1985/test4git