Change Button name
Merge remote-tracking branch 'upstream/master'
Merge pull request #30 from mschaddel/master

Added weather button
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
Added Pages

After creating workout, app goes to new main menu that has view workout
instead of create workout. Made a filler view workout page. Adjusted
layout on settings page a little.
Merge pull request #31 from mschaddel/master

Updated Backlog
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...
Update BackLog
Working on Weight Update
Alarm, notification, and calendar all fixed up.  implementing an 11am reminder notification with alarm
built in.  The notification alarm and calendar scheduler can be turned off in settings.  The way it is now
if you recheck the alarm or notification button they will go off from that day forward until they are
unchecked again.
'Not sure if previous commit sent, so sending again' again
Added Sprint Review
Changed Popups for reset buttons and weight updater now in place every sunday
Merge pull request #34 from rmcdole/Ryan

Ryan
small bug fix