working on getting user details from fitbit
resolving a merge
getting user details from fitbit
merged conflicts