顾问登陆，学生录入
Merge branch 'master' of github.com:skyyuan/xiaomalx into login1

Conflicts:
	config/routes.rb
Merge pull request #3 from skyyuan/login1

Login1