add decimal test and working calculator
Merge branch 'master' of https://github.com/stephania07/calculator

Conflicts:
	main.js
	spec/test.js