fafa
Merge branch 'master' of github.com:hszuydcase/Music-db-case2-second-edition

Conflicts:
	Music/Music.csproj
	Music/Program.cs
Merge branch 'master' of github.com:hszuydcase/Music-db-case2-second-edition
Merge branch 'master' of github.com:hszuydcase/Music-db-case2-second-edition

Conflicts:
	Music/Music.csproj
	Music/Program.cs