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

Conflicts:
	MediaPlayer/MainWindow.xaml.cs
Merge branch 'master' of https://github.com/Eygle/wmp