Changed method testMultiply()
Merge branch 'master' of https://github.com/etteru/calculator

Conflicts:
	src/test/java/ch/etter/ulrich/CalculatorTest.java