Made it a legitimate calculator
Merge remote-tracking branch 'origin/master'

Conflicts:
	uncertainty.html