Merge origin/master

Conflicts:
	homeWork1_task2/src/homework1_task2/classHelper.java
Merge origin/master

Conflicts:
	homeWork1_task2/src/homework1_task2/classHelper.java