Change Button name
Merge remote-tracking branch 'upstream/master'
Implementing Treadmill CheckBox
Merge remote-tracking branch 'upstream/master'

Conflicts:
	workspace/testing/bin/classes.dex
	workspace/testing/bin/classes/com/example/testing/R$id.class
	workspace/testing/bin/classes/com/example/testing/R$layout.class
	workspace/testing/bin/classes/com/example/testing/R$menu.class
	workspace/testing/bin/classes/com/example/testing/R$string.class
	workspace/testing/bin/classes/com/example/testing/R$style.class
	workspace/testing/bin/resources.ap_
	workspace/testing/gen/com/example/testing/R.java
	workspace/testing/res/layout/main_menu.xml
Treadmill Buttons Added
Disabled Rotation on GPS
Merge remote-tracking branch 'upstream/master'

Conflicts:
	workspace/testing/bin/classes.dex
	workspace/testing/bin/classes/com/example/testing/R$id.class
	workspace/testing/bin/classes/com/example/testing/R$layout.class
	workspace/testing/bin/classes/com/example/testing/R$menu.class
	workspace/testing/bin/classes/com/example/testing/R$string.class
	workspace/testing/bin/classes/com/example/testing/R$style.class
	workspace/testing/bin/resources.ap_
	workspace/testing/bin/testing.apk
	workspace/testing/gen/com/example/testing/R.java
Removed old code from GPS
Merge pull request #32 from jwisch91/master

I wonder if Scannell actually reads these...