playlist
Merge branch 'master' of https://github.com/Adam140/Player.git

Conflicts:
	MainWindow.xaml.cs
	Player.csproj