計算機先上去
calculator total ok
改btn顏色
Merge branch 'masterDevelop' into Yijing_Dev
merge from master