Merge branch 'master' of C:\Users\Nsikak\Desktop\datadrivenmusic_player with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
info