用了新硬盘
Merge branch 'master' of github.com:minixia/zhidequ

Conflicts:
	app/assets/javascripts/questions.js.coffee
	app/controllers/answers_controller.rb
	app/models/user.rb
	app/views/questions/_comments.html.erb
	app/views/questions/show.html.erb
初步完成评论功能，缺少修改和删除