Change func name
Change func name
Change func name
Change func name
Change test
change test
the model notepad test
update test email
Merge pull request #19 from zsc1528/hotfix

fix hotfix, fix the coding:utf8
Merge pull request #18 from zsc1528/update_tests

Update tests，增加notepad简单测试
Merge pull request #20 from huahu/work

pep8  更改
change
Merge branch 'master' of https://github.com/billychou/sphinx

Conflicts:
	sphinx/note/func.py
	sphinx/note/models.py
	sphinx/note/tests.py
	sphinx/note/views.py
fix some error
补充test
改变空格和删除model里面多余的行
更新utils.py中的不符合pep8的地方
Merge pull request #23 from zsc1528/basic

重新变量命名，定义基本函数命名，主要是更改func命名改为utils
删除urls.py中引入的无用的文件