commit and push api.php
Merge branch 'master' of https://github.com/youniforever/git_test.git

Conflicts:
	api.php
aaa