Merge pull request progit#1376 from max123kl/patch-3

Update advanced-merging.asc

Add asciibook info

Merge pull request progit#1374 from progit/Svenska-translation

Add pointer to Swedish translation

Merge pull request progit#1371 from max123kl/patch-3

Update reset.asc

Merge pull request progit#1370 from UgmaDevelopment/patch-1

Correct windows user location

Merge pull request progit#1368 from phil-blain/submodule-sync

Submodules: mention `git submodule sync`

Use “their” instead of “his” (progit#1360)

Use “their” instead of “his”

Merge pull request progit#1364 from dmitriysmirnovjb/master

Add basic information about Git in JetBrains IDEs

Merge pull request progit#1363 from aollier/PowerShell

PowerShell

Merge pull request progit#1362 from Morganov/fix-formatting

Use monosace font for 'master' branch name