add sample2
add master
Merge branch 'release'

Conflicts:
	base.md
add hahaha
add 1
Merge branch 'master' of github.com:himinseop/dev
Merge pull request #5 from himinseop/release

Release테스트 확인완료.