huanyuande
test
test
Merge branch 'master' of github.com:kairo27/kairo

Conflicts:
	test.php
Revert "test"

This reverts commit 5e658fe3bd50ec498e10e9e4151486f20d68ca86.

Conflicts:
	test.php