work commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/javarush/test/level09/lesson11/bonus02/Solution.java