1
lesson 7 done
Merge branch 'master' of https://github.com/y-rybyak/JRHW

Conflicts:
	.idea/workspace.xml
	src/com/javarush/test/level16/lesson07/task04/Solution.java