few changes
Merge branch 'master' of https://github.com/arzhed/snapgram

Conflicts:
	routes/feed.js