Made display changes to fix decimal issues
Merged with master
Merge branch 'master' of https://github.com/AdamSheaffer/Calculator

Conflicts:
	main.js