DONE
Merge branch 'master' of https://github.com/kennyzlei/movietrends-cs171