multiplikation
calculator.py

Conflicts:
	calculator.py