调整格式,增加提问的智慧
IntelliJ IDEA 13 Key
Merge remote-tracking branch 'origin/master'