initial commit Rami
Merge branch 'master' of https://github.com/kushrp/RK-repo

Conflicts:
	calc.py