little things
Merge branch 'master' of https://github.com/Charlie-Y/CS147-project

Conflicts:
	routes/video.js
Merge branch 'master' of https://github.com/Charlie-Y/CS147-project