20140521-5 选题
Merge branch 'master', remote-tracking branch 'lctt/master'