sync
Merge remote-tracking branch 'origin/dog' into dog

Conflicts:
	sd.txt