divition
Merge remote-tracking branch 'origin/master'

Conflicts:
	calculator.py
div plus minus
Merge branch 'master' of https://github.com/kogart/calculator

Conflicts:
	calculator.py