Update best-practices.md
Conflicts:
	git-best-practices.md