Task 2
Merge branch 'feature-2' into development

Conflicts:
	src/main/java/com/junittesting/example1/Calculator.java