路径修改
前台页面链接
Merge branch 'master' of github.com:pirate1992/junemovie

Conflicts:
	config/routes.rb
Merge branch 'master' of github.com:pirate1992/junemovie

Conflicts:
	app/views/movies/show.html.erb
titles修改
Merge branch 'master' of github.com:pirate1992/junemovie
  最新版本