WPF project
Merge branch 'master' of https://github.com/SeventhSon/music_player

Conflicts:
	.gitignore