Local mongodb
Merge branch 'workingLocal'

Conflicts:
	app.js