I added my name to the commit.
Merge branch 'master' of https://github.com/alveyworld-dev/calculator

Conflicts:
	test.py