diff --git a/MoCha/Assets/Plugins.meta~Stashed changes b/MoCha/Assets/Plugins.meta~Stashed changes
new file mode 100644
index 0000000..12bb076
--- /dev/null
+++ b/MoCha/Assets/Plugins.meta~Stashed changes	
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 36a268db14e08be4586c27503c77855b
+folderAsset: yes
+timeCreated: 1523388046
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MoCha/Assets/Plugins.meta~Stashed changes.meta b/MoCha/Assets/Plugins.meta~Stashed changes.meta
new file mode 100644
index 0000000..e28d3ae
--- /dev/null
+++ b/MoCha/Assets/Plugins.meta~Stashed changes.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a6833ac8a2686c841ac5a1b5b7b9be48
+timeCreated: 1523388413
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MoCha/Assets/Plugins/Android.meta b/MoCha/Assets/Plugins/Android.meta
index b46881b..7bc5691 100644
--- a/MoCha/Assets/Plugins/Android.meta
+++ b/MoCha/Assets/Plugins/Android.meta
@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 8cd453422b2e32245b54c76a62e2a81e
 folderAsset: yes
 timeCreated: 1523387294
+=======
+guid: e306a28a11a4976488ab98bb77d05c1d
+folderAsset: yes
+timeCreated: 1523388046
+>>>>>>> Stashed changes
 licenseType: Free
 DefaultImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Prefabs/Canvas.prefab b/MoCha/Assets/Prefabs/Canvas.prefab
index a39cd3c..4571dfd 100644
Binary files a/MoCha/Assets/Prefabs/Canvas.prefab and b/MoCha/Assets/Prefabs/Canvas.prefab differ
diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity
index 5d6c207..a77fda7 100644
Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ