d
f
Merge remote-tracking branch 'origin/master' into t

Conflicts:
	README.md