Tokyo test
Merge branch 'master' of https://github.com/Siflax/testMerge

Conflicts:
	test.php