Adding Log4j
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/testNG/CalculatorTestNG/divideFunctuontest/ClassCalculatorDivideByZero.java