添加第一条Grape API
Merge remote-tracking branch 'origin/master'