tmp
Merge branch 'master' of https://github.com/Eygle/wmp

Conflicts:
	MediaPlayer/View/MainWindow.xaml.cs