Merge pull request #1 from astaxie/master

merge update from ...astaxie:master
Fix archive/tar/Writer.md example error

Signed-off-by: sndnvaps <sndnvaps@gmail.com>
Merge remote-tracking branch 'origin/master'
Remove merge conflict

Signed-off-by: sndnvaps <sndnvaps@gmail.com>
Merge pull request #193 from sndnvaps/master

Fix archive/tar/Writer.md example