fixed cookie bug and song adding bug
Merge branch 'master' of github.com:vfang/MusicMe

Conflicts:
	musicme.db