Adjusted filename in git merge output

The previous operations on iss53 were clearly on index.html, so the
merge output should reflect that too for consistency. :)
Merge pull request #190 from justinclift/iss53_filename_fix

Adjusted filename in git merge output
Change merge commit to C6
Merge pull request #192 from progit/fix-figure

Change merge commit to C6
Fix typo in URL of the smart git-receive-pack

Reference: https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n292
Merge pull request #193 from damz/patch-1

Fix typo in URL of the smart git-receive-pack
Merge remote-tracking branch 'upstream/master'
Fix #25