Merge pull request #17 from amychiu/amy/development2

movie updates