?
new branch to work on models
about to merge with dev-pause-button
GHG and Calories work
fixed double to string length problem in previous trips
GHG now displays to 2 decimals
Updated kmh to represent average speed. testing now
Added a weight component to the user questionnaire. this uses NSUserDefaults instead of the data structure, mostly because I wanted to play with them and to avoid issues with them getting pushed to (and failing to get to) the server. Users can enable/disable calories, and set their weight in either lbs or kg
Added access to NSUserDefaults via defaults in header. Implemented a simple loop to go through weight data and to decide how to parse it.
Added localization strings for calorie features
some changes to strings that were not localized
adding some pictures. fixed some strings that weren't localized
Merge branch 'dev-model' into dev
manual conflict resolution