testing
Merge branch 'master' of github.com:berendt/sandbox

Conflicts:
	testing.rst