modify the bug
Merge remote branch 'hello/master'

Conflicts:
	templates/index.html
	templates/video-list.html
Merge pull request #35 from lucknessbuaa/master

merge hello/master