last commit
Merge branch 'master' of https://github.com/MagnumthaTyrant/Standard_Calc

Conflicts:
	JS/main.js
	README.md
	index.html