merge
Merge branch 'master' of github.com:bolotinvl/edu-project

Conflicts:
	.idea/workspace.xml
	src/examples/chapters/chapter11/MiniMiniMusicApp.java
	src/examples/chapters/chapter11/MiniMusicCmdLine.java