Created method divide and substract
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gitinit/Calculator.java
	test/CalculatorTest.java