Merge branch 'michael' of https://github.com/AzamAbdul/CCMUSIC into michael

Conflicts:
	index.html