3rd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/epam/main/Main.java