js做修改
Merge branch 'master' of github.com:answerme2014/answerme