新技能get
Merge branch 'master' of https://github.com/cocal/notes.git

Conflicts:
	sp/embedFun.py