增加顏色與邊框
Merge remote-tracking branch 'origin/master'

Conflicts:
	CropTheImage1/bin/classes/com/example/croptheimage/MainActivity$1.class
	CropTheImage1/bin/classes/com/example/croptheimage/MainActivity.class
	CropTheImage1/bin/classes/com/example/croptheimage/R$drawable.class
	CropTheImage1/bin/classes/com/example/croptheimage/R$id.class
	CropTheImage1/bin/classes/com/example/croptheimage/R$layout.class
	CropTheImage1/bin/classes/com/example/croptheimage/R$string.class
	CropTheImage1/bin/classes/com/example/croptheimage/R$style.class
	CropTheImage1/gen/com/example/croptheimage/R.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit cd7143445271c960ee8a0d9d96c5cbe4f1c2c281.