Allowed to selectively choose crop aspect ratio
Cropping modifies
Cropping modifies
Merge github.com:cs169-2013/mockup

Conflicts:
	app/views/photos/._crop.html.erb.swp
	app/views/photos/.edit.html.erb.swp
	app/views/photos/show.html.erb
	db/schema.rb