修改了users_controller
登陆，注册跳转
Merge branch 'master' of git://github.com/Kenrick-Zhou/case4rom

Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb
	app/views/users/signup.html.erb
	config/routes.rb