update main.cpp
Merge branch 'master' of github.com:wuzw/test