fixes + timestamp
Merge branch 'master' of https://github.com/arzhed/snapgram

Conflicts:
	routes/index.js