Merge pull request #1 from gaopu/master

更新
test
Merge branch 'master' of https://github.com/gaopu/Java_Calculate
Merge branch 'master' of github.com:lilinhan/Java_Calculate
字符串解析初稿