修正
Maerge branch 'master' of github.com:isofurabon/CUI_Calc

Conflicts:
	README.md