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
Android lint cleaning
Slightly rethemed button_rsense
Updated to Uploader 3.6
Merge remote-tracking branch 'upstream/master' into bd859
Changes to i
OS Pictures
Merge remote-tracking branch 'upstream/master' into goat
Little fix to Welcome screen in Uploader having text cut off due to bad weighting
app now runs without crashing when pushing button and uploads data but the data but the data is empty