BioHarness Demo Code
update
First BH push to new clone
Update
Merge branch 'master' into Bioharness

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/william/r_tug/MainActivity.class
	bin/classes/com/william/r_tug/R$id.class
	bin/classes/com/william/r_tug/R$layout.class
	bin/classes/com/william/r_tug/R$menu.class
	bin/classes/com/william/r_tug/R$string.class
	bin/classes/com/william/r_tug/R$style.class
	bin/dexedLibs/android-support-v4-bb021f0765299cac9f97155df13aa913.jar
	bin/resources.ap_
	gen/com/william/r_tug/R.java
Final commit test
Added Player and TestingPlayer classes
Added GameManager class with setup for threading of Game logic
Added basic game logic
Just more logic being added. Enum added for clarity on game status
Connection to multiple devices
Added time limit to logic
Added update function, removed unused functions
Merge branch 'Bioharness' into game-logic

Conflicts:
	.classpath
fixed
Multiple Bioharness connections with player class
Ability to get data from BH in other activities
Code cleaning
Merge branch 'game-logic' into Bioharness

Conflicts:
	bin/classes/com/william/r_tug/BioHarness$1.class
	bin/classes/com/william/r_tug/BioHarness$2.class
	bin/classes/com/william/r_tug/BioHarness$3.class
	bin/classes/com/william/r_tug/BioHarness$BTBondReceiver.class
	bin/classes/com/william/r_tug/BioHarness$BTBroadcastReceiver.class
	bin/classes/com/william/r_tug/BioHarness.class
	bin/com.william.r_tug.MainActivity.apk
	bin/dexedLibs/BioHarnessBT-c62e38cd8ddefbe38c632cd95a99e9ac.jar
	src/com/william/r_tug/BioHarness.java
Updated UI, and implemented switching views, without switching activities.