trying to fix repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cloudmp3/Cloudmp3/MainWindow.xaml