Merge pull request #27 from jwisch91/master

Beta Package
Updated Backlog
Merge pull request #28 from mschaddel/master

Updated Backlog
Update BackLog
Merge pull request #29 from mschaddel/master

Updated Backlog
Exit, Confirmation, Popups, etc

Lots of little changes.
Major change was the popup which can now be applied to anything using
the same format as what I made. Spent a good 5 hours on it haha.
Bug Fix

Fixed main page bug where it looked wrong while held in horizontal view.
Added scroll capability to settings page.
Added files
Change Button name
Merge remote-tracking branch 'upstream/master'
Added weather button
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