second task in feature 1
task 3
Merge remote-tracking branch 'origin/feature-2' into feature-1
Merge remote-tracking branch 'origin/development' into feature-1

Conflicts:
	src/main/java/com/junittesting/example1/Calculator.java
task4
Task 4
Change in dev