Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from ProgrammerYuan/master

后台修改
Merge pull request #6 from ProgrammerYuan/master

修改项目排序关键码
Merge remote-tracking branch 'upstream/master'
将存入session的question修改为question_id
Update questions_controller.rb
优化
修改session中存储的变量名current_question为current_question_id
Merge pull request #8 from ProgrammerYuan/master

保持代码库和服务器的一致性
Merge pull request #9 from Surlavi/master

解决Session里东西太多导致某些用户不能连接我们网站
Merge pull request #1 from xtdz/master

Merge