add sample2
add master
Update unit-api.php
Merge branch 'release'

Conflicts:
	base.md
add hahaha
Merge branch 'master' of github.com:wemakeprice/dev