delete .idea/workspace.xml
from my thinkpad
delete workspace.xml by thinkpad
Merge branch 'master' of https://github.com/imGiantChan/shangxin
a push test from thinkpad