Update base.md
Merge branch 'master' of github.com:wemakeprice/dev into new

Conflicts:
	base.md
Merge pull request #3 from himinseop/new

New
Merge pull request #1 from himinseop/master

Create sample.md
Create unit-api.php
Update sample.md
Merge branch 'master' of github.com:wemakeprice/dev into release

Conflicts:
	sample.md
Merge branch 'release'

Conflicts:
	base.md
add hahaha