template demo0
Merge branch 'master' of https://github.com/XMUCobra/MyTravo

Conflicts:
	travoprototype/travo/templates/travo/test.html