Fiddles: 11: Do include composer.lock in your VCS!
Git: Mention the term "Patch Mode" when talking about partially staging files
Merge branch 'master' into gh-pages