Modulus operator
Merge branch 'master' of https://github.com/marsh27/shiny-octo-dubstep

Conflicts:
	calc.py

message