Bluetooth Pairing Works
Merge branch 'master' of https://github.com/ZackMisso/HackTx

Conflicts:
	SlingShot/app/src/main/java/kraz/slingshot/MainActivity.java