add sample2
add master
Merge branch 'release'

Conflicts:
	base.md
add hahaha