小小的一更。不要冲突哦
Merge branches 'master' and 'master' of https://github.com/littleduner/kb-project-v2

Conflicts:
	lib/myJquery.min.js
	stylesheets/myStyle.css
	stylesheets/myStyle.less