fix calculation error
Merge branch 'master' of https://github.com/june3474/spreadsheet
Merge branch 'master' of https://github.com/june3474/spreadsheet
solve conflicts

Conflicts:
	spreadsheet.pro.user