aasdsdsad
添加一张计算器的图片供参考
和gonjay的repo保持同步
This a useless commit in order to make saiko understand git
 hello
Revert "添加一张计算器的图片供参考"

This reverts commit 1d03c6cf6edb8848e80a4ef9913ab61070bf8633.
fix jquery file
Merge branch 'master' of https://github.com/gonjay/calculator
XXXX you chenbin to delete my file without my permission
update
Spec scripts position
fix some conflicts of CDN link
push test
merge calculator
merge fixed
Merge pull request #9 from gongting/master

处理合并冲突