fixed photo description
Canobie Physics app builds
Merge remote-tracking branch 'origin/bd859' into bd859
menu is now working correctly
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
Merge remote-tracking branch 'upstream/master' into bd859
the setup menu is almost complete and all the other menus are functional
merge conflics
Merge remote-tracking branch 'origin/bd859' into bd859
merge conflict
configuration menu functions
Merge remote-tracking branch 'upstream/master' into bd859
Changes to i
OS Pictures
app now runs without crashing when pushing button and uploads data but the data but the data is empty
Merge pull request #969 from stowellm/goat

Uploader 3.6 and 3.6.1 Changes
something
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
removed usernames from Android API
Merge pull request #970 from nickavv/parachute

Removed usernames from Android API