modulus
Merge branch 'master' of https://github.com/burkeg/the-lab-that-must-not-be-named-lab7

Conflicts:
	calc.py

merged