添加note
Merge branch 'master' of https://github.com/XMUCobra/MyTravo

Conflicts:
	Server/travo/sviews.py
	Server/travo/templates/website/new_note.html