Create sample.md
Create sample2.md
Create base.md
Merge branch 'master' of github.com:wemakeprice/dev

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

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

New