Progs some
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cloudmp3/Cloudmp3/Cloudmp3.csproj
	Cloudmp3/Cloudmp3/MainWindow.xaml
	Cloudmp3/Cloudmp3/MainWindow.xaml.cs
Merge branch 'master' of https://github.com/bluemiles/cloudmp3

Conflicts:
	Cloudmp3/Cloudmp3/MainWindow.xaml.cs