functionnal testing and stuffs
Merge branch 'master' of https://github.com/arzhed/snapgram

Conflicts:
	routes/bulk.js