modified some of them
Merge branch 'master' of https://github.com/JessicaShi/CS249Project

Conflicts:
	CS249MovieRecommendation/movie.cpp
Merge branch 'master' of https://github.com/JessicaShi/CS249Project

Conflicts:
	CS249MovieRecommendation/movie.cpp