Create .gitignore
upload
Mego upd
delete jpg
вфыа
Merge branch 'develop' of https://github.com/meleni/MathSolver into develop

Conflicts:
	.gitignore
	src/Calculator.java