PUSH! PUSH!!! PUSH!!!!!!!!!!!
Merge branch 'master' of github.com:IDWMaster/BetaEagle

Conflicts:
	BestCartwheel/BestCartwheel/bin/BestCartwheel.apk
	BestCartwheel/BestCartwheel/bin/classes.dex
	BestCartwheel/BestCartwheel/bin/classes/ble/BLEScanner$1.class
	BestCartwheel/BestCartwheel/bin/classes/ble/BLEScanner.class
	BestCartwheel/BestCartwheel/bin/classes/ble/Target.class
	BestCartwheel/BestCartwheel/bin/classes/com/example/bestcartwheel/menu$1.class
	BestCartwheel/BestCartwheel/bin/classes/com/example/bestcartwheel/menu.class
	BestCartwheel/BestCartwheel/bin/classes/com/example/bestcartwheel/nearby$1$1.class
	BestCartwheel/BestCartwheel/bin/classes/com/example/bestcartwheel/nearby$1.class
	BestCartwheel/BestCartwheel/bin/classes/com/example/bestcartwheel/nearby.class
	BestCartwheel/BestCartwheel/bin/dexedLibs/appcompat_v7-9946f72555db12bda77c65c69cea51d0.jar
	BestCartwheel/BestCartwheel/bin/resources.ap_
	BestCartwheel/BestCartwheel/src/com/example/bestcartwheel/menu.java