重新完善登入页面
删除重复 migration 文件
修改样式
Merge branch 'master' of github.com:pirate1992/junemovie

Conflicts:
	app/views/news/show.html.erb