js corrections
Merge remote-tracking branch 'upstream/master'
delete dead files
Merging with Julie's repo

Merge remote-tracking branch 'upstream/master'
integrating input object for inputting genre