Merge branch 'master' of https://github.com/aDudko/JavaTasks

Conflicts:
	IdeaProjects/progectFirst/src/com/suchorukov/dudko/Main.java