Modified index and css slightly
Merge branch 'master' of https://github.com/davidgvns/calculator

Conflicts:
	index.html
	main.js
	test.js