Cleaned up prefabs... might cause merge conflicts. Added fonts.

MoCha/Assets/Fonts.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 36a268db14e08be4586c27503c77855b
+guid: b4e3c483abcceef40b7ecaf5f6e6a97a
 folderAsset: yes
-timeCreated: 1523388046
+timeCreated: 1523555905
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

MoCha/Assets/Fonts/All Things Pink Skinny.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 16fa5742d5f3a4e4f888e6ee59fd53c8
+timeCreated: 1523556714
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: All Things Pink Skinny
+  fontNames:
+  - All Things Pink Skinny
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/All Things Pink.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: d38f3d0f1045b2f4cb509995afa5c861
+timeCreated: 1523556709
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: All Things Pink
+  fontNames:
+  - All Things Pink
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 2400d4713aa74ce4ca7dc368886d7857
+timeCreated: 1523556729
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Chocolate Covered Raindrops Bol
+  fontNames:
+  - Chocolate Covered Raindrops Bol
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 678bbcb4b61bb804995ce113a087c7dd
+timeCreated: 1523556729
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Chocolate Covered Raindrops Hol
+  fontNames:
+  - Chocolate Covered Raindrops Hol
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 797901ead3866484b9fd79273ffe70b8
+timeCreated: 1523556724
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Chocolate Covered Raindrops
+  fontNames:
+  - Chocolate Covered Raindrops
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/SaucerBB.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 885e0ce5c093c1a4990f87656db90876
+timeCreated: 1523555966
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Saucer BB
+  fontNames:
+  - Saucer BB
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Plugins.meta~Stashed changes.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: a6833ac8a2686c841ac5a1b5b7b9be48
-timeCreated: 1523388413
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

MoCha/Assets/Prefabs/Base Canvas.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 43ffee412d195f7439561e503c0cb541
-timeCreated: 1523382322
+guid: 7d0f216d6d3858a479598e82060a4c1e
+timeCreated: 1523557265
 licenseType: Free
 NativeFormatImporter:
   externalObjects: {}