Merge remote-tracking branch 'origin/gh-pages' into git-operations

Conflicts:
	2-concepts/index.md