add my code and merge the changes
add code and merge change
Merge branch 'master' of https://github.com/shibai/nova_movie