trying to figure grab pixel color
switching patterns
switching patterns
Merge branch 'master' into test

Conflicts:
	Drawing/bin/classes/com/example/drawing/DrawingView.class
	Drawing/bin/classes/com/example/drawing/MainActivity.class
	Drawing/bin/classes/com/example/drawing/R$drawable.class
	Drawing/bin/classes/com/example/drawing/R$id.class
	Drawing/bin/classes/com/example/drawing/R$integer.class
	Drawing/bin/classes/com/example/drawing/R$layout.class
	Drawing/bin/classes/com/example/drawing/R$menu.class
	Drawing/bin/classes/com/example/drawing/R$string.class
	Drawing/bin/classes/com/example/drawing/R$style.class
test
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	Drawing/bin/Drawing.apk
	Drawing/bin/classes.dex
	Drawing/bin/classes/com/example/drawing/DrawingView.class
	Drawing/bin/classes/com/example/drawing/MainActivity.class
	Drawing/bin/classes/com/example/drawing/R$drawable.class
	Drawing/bin/classes/com/example/drawing/R$id.class
	Drawing/bin/classes/com/example/drawing/R$integer.class
	Drawing/bin/classes/com/example/drawing/R$layout.class
	Drawing/bin/classes/com/example/drawing/R$menu.class
	Drawing/bin/classes/com/example/drawing/R$string.class
	Drawing/bin/classes/com/example/drawing/R$style.class
	Drawing/bin/resources.ap_
	Drawing/gen/com/example/drawing/R.java
	Drawing/res/layout/activity_main.xml
	Drawing/src/com/example/drawing/DrawingView.java
	Drawing/src/com/example/drawing/MainActivity.java