updated algorithm
Merge branch 'master' of https://github.com/christinethayer/LoveCalc

Conflicts:
	web/js/Calc.js