update upload.js
sdfa
Merge branch 'master' of https://github.com/baysao/admin.movideo.us

Conflicts:
	routes/upload.js
adfsad
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us
Merge branch 'master' of https://github.com/baysao/admin.movideo.us