111
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/javarush/test/level11/lesson11/home05/Solution.java