sghrgs
Merge branch 'master' of https://github.com/mchaiken/imageIdentifier

Conflicts:
	Cropping/1-cropped.jpg
	Cropping/1-uncropped.png
	Cropping/Cropping.pde
	Cropping/apistuffs.pde
afdsdac
Merge branch 'master' of https://github.com/mchaiken/imageIdentifier

Conflicts:
	Cropping/1-cropped.jpg
	Cropping/1-uncropped.png
	Cropping/Cropping.pde
	Cropping/apistuffs.pde