Merge branch 'iss1'

Conflicts:
	Task1/src/test/java/com/epam/steps/Step.java