小修#100

AndorChen wants to merge 2 commits intoruby-china:masterruby-china/rails-guides:masterfrom

AndorChen:masterAndorChen/ruby-china_rails-guides:masterCopy head branch name to clipboard