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

Conflicts:
	Playlist.xaml