updated to include 'tests' block
Merge branch 'refs/heads/master' into japanese

Conflicts:
	articles/testing/index.txt