Saving photo
Merge branch 'master' of https://github.com/marieshifeng/vincere

Conflicts:
	app.js
	models/image.js
	public/.DS_Store
	routes/index.js
	views/connect.ejs