corrected bug with minus sign (-2^2 would result in 4)
Merge branch 'graph'

Conflicts:
	calc.html