Story and Usage
Merge branch 'master' of https://github.com/menslow/cropsy

Conflicts:
	app/templates/image/edit.hbs