local-change

local
Merge branch 'master' of https://github.com/ProjPossibility/2014-USC-DRG

Conflicts:
	Bluetooth_faster_connection/bin/Bluetooth_faster_connection.apk
	Bluetooth_faster_connection/bin/classes.dex

Bluetooth_faster_connection/bin/classes/com/example/bluetooth_faster_con
nection/MainActivity$1.class

Bluetooth_faster_connection/bin/classes/com/example/bluetooth_faster_con
nection/MainActivity$2.class

Bluetooth_faster_connection/bin/classes/com/example/bluetooth_faster_con
nection/MainActivity$UpdateTask.class

Bluetooth_faster_connection/bin/classes/com/example/bluetooth_faster_con
nection/MainActivity.class
jason

Add vibration
ghgh
111
11