Create .gitignore
upload
Merge branch 'master' of https://github.com/meleni/MathSolver

Conflicts:
	.gitignore
	src/Calculator.java