merge
merge
Merge branch 'master' of github.com:lozy219/Hey-movie
fix movie display problem
Merge branch 'master' of github.com:lozy219/Hey-movie