added mod function
Merge branch 'master' of https://github.com/jpan2014/Python-calculator

Conflicts:
	calc.py