Sarasa
Merge branch 'master' of https://github.com/nachoalthabe/gridfs-stream

Conflicts:
	package.json