test4
Merge branch 'master' of https://github.com/solitas/MusicPlayerWPF

Conflicts:
	.gitignore
	MP3Testing.v12.suo