Inlcuded comment for feature 1
Included comment for feature 2
Finished task in feature 1
Included finished task
Merge branch 'feature-1' into development
Merge branch 'feature-2' into development

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