fixed a catastrophic merge conflict error from before in movies.js
Merge pull request #27 from jpark1120/master

fixed a catastrophic merge conflict error from before in movies.js