arreglo nuevo
Merge branch 'master' of https://github.com/leo7r/Woopit

Conflicts:
	bin/Woopit.apk
	bin/classes.dex
	bin/classes/com/woopitapp/MainActivity$1.class
	bin/classes/com/woopitapp/MainActivity$2.class
	bin/classes/com/woopitapp/MainActivity$3.class
	bin/classes/com/woopitapp/MainActivity$4.class
	bin/classes/com/woopitapp/MainActivity$CameraView.class
	bin/classes/com/woopitapp/MainActivity$Cube.class
	bin/classes/com/woopitapp/MainActivity$CustomCameraView$1.class
	bin/classes/com/woopitapp/MainActivity$CustomCameraView.class
	bin/classes/com/woopitapp/MainActivity$GLClearRenderer.class
	bin/classes/com/woopitapp/MainActivity.class
	bin/classes/com/woopitapp/R$drawable.class
	bin/classes/com/woopitapp/R$id.class
	bin/classes/com/woopitapp/R$layout.class
	bin/classes/com/woopitapp/R$menu.class
	bin/classes/com/woopitapp/R$string.class
	bin/classes/com/woopitapp/R$style.class
	bin/resources.ap_
	gen/com/woopitapp/R.java