add
opt
opt
opt
Merge branch 'download_img'

Conflicts:
	app.coffee