Fix broken URLs
Merge pull request #254 from leemachin/fix-broken-urls

Fix broken URLs
Update sitemap.html.markdown
Merge pull request #255 from lsdafjklsd/patch-1

Update sitemap.html.markdown
Update custom.html.markdown, fixes #256
Merge pull request #257 from lord/patch-1

Update custom.html.markdown, fixes #256
Merge remote-tracking branch 'upstream/master' into localized

Conflicts:
	source/advanced/custom.html.markdown
	source/advanced/sitemap.html.markdown
	source/basics/blogging.html.markdown
	source/basics/getting-started.html.markdown
	source/basics/helpers.html.markdown
	source/basics/pretty-urls.html.markdown
Update '作業方法'