Merge branch 'master' of https://github.com/Ge0rges/SimpleCalculatorHD

Conflicts:
	.DS_Store