[zh] Update chapter 3, fixed one spelling
Update link and name to Plans and pricing page
Merge pull request #859 from randomecho/ch4-plans-pricing-link

Update link and name to Plans and pricing page
Merge pull request #858 from cheyiliu/master

[zh] Update chapter 3, fixed one spelling
Fix BFG capability
Merge pull request #862 from conkiztador/patch-1

Fix BFG capability
[fr] newer code snippets
Merge branch 'master' of https://github.com/progit/progit.git
[fr] newer snippets in ch.1 and some in ch.2