Gentlemen
Merge branch 'master' of https://github.com/alveyworld-dev/calculator

Conflicts:
	main.py
Merge branch 'master' of https://github.com/alveyworld-dev/calculator