test readme vs. other dirs
Merge branch 'origin/master'

Conflicts:
	test/actual/links/one.md
Merge branch 'origin/master'