Olga
Second
Merge branch 'master' of github.com:PracticeOlgaLiza/Practice

Conflicts:
	GeneralProgect/.idea/workspace.xml
	GeneralProgect/out/production/GeneralProgect/model/AbstractModel.class
	GeneralProgect/out/production/GeneralProgect/model/SoundModel.class
	GeneralProgect/out/production/GeneralProgect/viewer/SoundViewer$nextActionListener.class
	GeneralProgect/out/production/GeneralProgect/viewer/SoundViewer$playActionListener.class
	GeneralProgect/out/production/GeneralProgect/viewer/SoundViewer$prevActionListener.class
	GeneralProgect/out/production/GeneralProgect/viewer/SoundViewer.class
	GeneralProgect/out/production/GeneralProgect/viewer/Viewer.class
	GeneralProgect/src/model/AbstractModel.java
	GeneralProgect/src/viewer/SoundViewer.java
	GeneralProgect/src/viewer/Viewer.java