git merge
Merge branch 'master' of github.com:tumao/Smar_xd