upload single photos and GET /feed working (MERGING FROM OLD COMMIT)
chmoded
Merge branch 'master' into merge-old-state

Conflicts:
	routes/bulk.js
	routes/feed.js