shame fix
Merge branch 'master' of github.com:ycczkl/mean-upload

Conflicts:
	server/routes/meanUpload.js