Literally the coolest mod function you have ever seen
Merge branch 'master' of github.com:elliottwilliams/cs190lab7

Conflicts:
	calc.py