Now generating public url for uploaded images

Conflicts:
	public/index.html
	public/js/app.js