gong
gong
Merge branch 'master' of https://github.com/richardgong1987/levin

Conflicts:
	images/hollywood/movieCover_3.png
	images/hollywood/movie_3.png
gong
gong
gong