new movie
resolved conflict
Merge pull request #9 from pdgarvey/merge1

new movie