Day 7: project improving
Merge branch 'master' of https://github.com/Mikhail-Ivanov/M2-OODP

Conflicts:
	.idea/workspace.xml