finish the merge
fix some bugs
Merge branch 'master' of https://github.com/JessicaShi/Movie-Recommendation-System