diff --git a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta
index a23005d..a7829bd 100644
--- a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta
+++ b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 80685d60eb42cd340a5c76d410187801
 timeCreated: 1524716619
+=======
+guid: 1d9a971c325c98e4a81ea4ec2e52aed6
+timeCreated: 1524756178
+>>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs b/MoCha/Assets/Scripts/FitBitAPI.cs
index 7563052..aca4ed7 100644
--- a/MoCha/Assets/Scripts/FitBitAPI.cs
+++ b/MoCha/Assets/Scripts/FitBitAPI.cs
@@ -42,7 +42,7 @@ namespace Assets.Scripts.Fitbit
 
         private OAuth2AccessToken _oAuth2 = new OAuth2AccessToken();
         public FitbitData _fitbitData = new FitbitData();
-
+        
         private string _statusMessage;
 
         private string CallBackUrl
@@ -67,7 +67,6 @@ namespace Assets.Scripts.Fitbit
         {
             DontDestroyOnLoad(this);
         }
-
         private void OnGUI()
         {
             if (!_bGotTheData && !string.IsNullOrEmpty(_statusMessage) && _bFirstFire)
@@ -124,7 +123,6 @@ namespace Assets.Scripts.Fitbit
 
             _wwwRequest = new WWW(_tokenUrl, form.data, headers);
             StartCoroutine(WaitForAccess(_wwwRequest));
-
             
             while (!_wwwRequest.isDone)
             {
@@ -136,7 +134,6 @@ namespace Assets.Scripts.Fitbit
             var parsed = new JSONObject(_wwwRequest.text);
             ParseAccessToken(parsed);
             Debug.Log("\nParsed Token: " + _oAuth2.Token);
-            
             GetAllData();
             Debug.Log("Steps from Fitbit: " + _fitbitData.CurrentSteps);
             _bGotTheData = true;
@@ -157,7 +154,6 @@ namespace Assets.Scripts.Fitbit
 
             _wwwRequest = new WWW(_tokenUrl, form.data, headers);
             StartCoroutine(WaitForAccess(_wwwRequest));
-
             while (!_wwwRequest.isDone)
             {
             }
@@ -185,7 +181,6 @@ namespace Assets.Scripts.Fitbit
                 return;
             _returnCode = code.Substring(CustomAndroidScheme.Length + 6);
             Debug.Log("Return Code is: " + _returnCode);
-
             UseReturnCode();
         }
 
@@ -197,9 +192,6 @@ namespace Assets.Scripts.Fitbit
             _returnCode = code;
             UseReturnCode();
         }
-
-
-
         
         public void GetAllData()
         {
@@ -229,7 +221,7 @@ namespace Assets.Scripts.Fitbit
             _wwwRequest = new WWW(_profileUrl, null, headers);
             Debug.Log("Doing GET Request");
             StartCoroutine(WaitForAccess(_wwwRequest));
-
+            
             while (!_wwwRequest.isDone)
             {
             }
@@ -247,7 +239,7 @@ namespace Assets.Scripts.Fitbit
             _wwwRequest = new WWW(_caloriesUrl, null, headers);
             Debug.Log("Doing Calories GET Request");
             StartCoroutine(WaitForAccess(_wwwRequest));
-
+            
             while (!_wwwRequest.isDone)
             {
             }
@@ -263,8 +255,7 @@ namespace Assets.Scripts.Fitbit
             _wwwRequest = new WWW(_distanceUrl, null, headers);
             Debug.Log("Doing Distance GET Request");
             StartCoroutine(WaitForAccess(_wwwRequest));
-
-
+            
             while (!_wwwRequest.isDone)
             {
             }
@@ -281,7 +272,7 @@ namespace Assets.Scripts.Fitbit
             _wwwRequest = new WWW(_stepsUrl, null, headers);
             Debug.Log("Doing Steps GET Request");
             StartCoroutine(WaitForAccess(_wwwRequest));
-
+            
             while (!_wwwRequest.isDone)
             {
             }
@@ -324,14 +315,13 @@ namespace Assets.Scripts.Fitbit
                 {
                     if (kvp.Key == "avatar")
                         continue;
-
+                    
                     //put a space between the camelCase
                     var tempKey = Regex.Replace(kvp.Key, "(\\B[A-Z])", " $1");
                     //then capitalize the first letter
                     UppercaseFirst(tempKey);
                 }
             }
-
             _bGotTheData = true;
         }
         #endregion
@@ -406,7 +396,6 @@ namespace Assets.Scripts.Fitbit
             XDocument doc = XDocument.Parse(json.InnerXml);
             var root = doc.Descendants("value").FirstOrDefault();
             _fitbitData.CurrentSteps = ToInt(root.Value);
-
             Debug.Log("Steps from Fitbit: " + _fitbitData.CurrentSteps);
         }
 
@@ -480,7 +469,6 @@ namespace Assets.Scripts.Fitbit
                 Debug.Log(www.error);
             }
             Debug.Log("end of WaitForAccess \n");
-
         }
 
         //just a utility function to get the correct date format for activity calls that require one
@@ -509,8 +497,6 @@ namespace Assets.Scripts.Fitbit
             return date;
         }
 
-       
-
         private int ToInt(string thing)
         {
             var temp = 0;
diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs.meta b/MoCha/Assets/Scripts/FitBitAPI.cs.meta
index 8514324..beb83a4 100644
--- a/MoCha/Assets/Scripts/FitBitAPI.cs.meta
+++ b/MoCha/Assets/Scripts/FitBitAPI.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: aa5e856e9b878764db7c192f3aa20277
 timeCreated: 1524716713
+=======
+guid: 849590d4a954ae445aa5db73d734450c
+timeCreated: 1524756213
+>>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/FitbitCaller.cs.meta b/MoCha/Assets/Scripts/FitbitCaller.cs.meta
index 1dc151a..57119f4 100644
--- a/MoCha/Assets/Scripts/FitbitCaller.cs.meta
+++ b/MoCha/Assets/Scripts/FitbitCaller.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 36444c03eedb84147a326a329de30d0e
 timeCreated: 1524716713
+=======
+guid: 80ba6a52e9d55564fbe8130844b17f29
+timeCreated: 1524756213
+>>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/FitbitData.cs.meta b/MoCha/Assets/Scripts/FitbitData.cs.meta
index add5ba3..e0b1ea8 100644
--- a/MoCha/Assets/Scripts/FitbitData.cs.meta
+++ b/MoCha/Assets/Scripts/FitbitData.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 7a928c029cb14204588724261a513ec1
 timeCreated: 1524716713
+=======
+guid: 1d8622418b8bead4cad17658d650c6c2
+timeCreated: 1524756213
+>>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/JSONObject.cs.meta b/MoCha/Assets/Scripts/JSONObject.cs.meta
index c095bab..7347c44 100644
--- a/MoCha/Assets/Scripts/JSONObject.cs.meta
+++ b/MoCha/Assets/Scripts/JSONObject.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: da64cad21a33a6444ac511376fcb771b
 timeCreated: 1524716713
+=======
+guid: 9101b04121334074fb6e70fc34eeb3f9
+timeCreated: 1524756213
+>>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta
index 320c6d8..ba51381 100644
--- a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta
+++ b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta
@@ -1,6 +1,11 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 2e4069fa83cbbb041aa91e83f7ece28e
 timeCreated: 1524716713
+=======
+guid: 1d4c10710438d404085599a6fe50d37b
+timeCreated: 1524756213
+>>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/UpgradeLog.htm b/MoCha/UpgradeLog.htm
new file mode 100644
index 0000000..d82fb2a
Binary files /dev/null and b/MoCha/UpgradeLog.htm differ