test
Merge remote-tracking branch 'upstream/master'
Merging with Julie's repo

Merge remote-tracking branch 'upstream/master'
integrating input object for inputting genre
debugged and now pulling input into API string
now pulls info to page, just need to setup for backbone
now pulls info to page, just need to setup for backbone
testing commit hook
Merge pull request #2 from abergen84/master

Ok! made some updates this afternoon. Merged pull request