WOW: forgot to push the file
Merge
Merge branch 'master' of https://github.com/arzhed/snapgram

Conflicts:
	routes/dbConnection.js