commit gitignore
update gitignore to remote
Merge branch 'repaired'
Merge https://github.com/blueolive/Simple-Calculator

Conflicts:
	.gitignore
commit