first commit
Merge branch 'master' of code.csdn.net:yuanruomu/kenshin-base

Conflicts:
	README.md