修改路径
Merge branch 'master' of github.com:pirate1992/junemovie
删除
修改
Merge branch 'master' of github.com:pirate1992/junemovie

Conflicts:
	app/assets/stylesheets/ss.css
	app/views/welcome/index.html.erb
大换血，movie修改好