Merge pull request #18 from amychiu/amy/development2

some updates
search redesigned for genres
removed test controller
trailer
detail view updated
Merge pull request #19 from jmr12345/dev_withA

More updates