lol
Merge branch 'master' of github.com:hszuydcase/music-db-case2

Conflicts:
	Music Index/Form1.Designer.cs
Merge branch 'master' of github.com:hszuydcase/music-db-case2

Conflicts:
	Music Index/Form1.Designer.cs
Merge branch 'master' of github.com:hszuydcase/music-db-case2

Conflicts:
	Music Index/Form1.Designer.cs