Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad

IronToad_UnityProject/Assets/Sound.meta~HEAD_0

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e3b0c439ea6f28c4fb3ce6bc58682b6b
+folderAsset: yes
+timeCreated: 1485052873
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound/Music.meta

@@ -1,8 +1,15 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: f58a00a3100922d4288203443c54d1a5
+folderAsset: yes
+timeCreated: 1485052873
+licenseType: Pro
+=======
 guid: be2c14b0c562c483bbe057367939b479
 folderAsset: yes
 timeCreated: 1485052376
 licenseType: Free
+>>>>>>> 497ca195525b3f1160bab1491e71a9a013e118fb
 DefaultImporter:
   userData: 
   assetBundleName: 

IronToad_UnityProject/Assets/Sound/SFX.meta

@@ -1,8 +1,15 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: d96f9b1229b84cb41b71f2332674b8e1
+folderAsset: yes
+timeCreated: 1485052873
+licenseType: Pro
+=======
 guid: bb5698073b8d847298f0287fcfbdd0de
 folderAsset: yes
 timeCreated: 1485052376
 licenseType: Free
+>>>>>>> 497ca195525b3f1160bab1491e71a9a013e118fb
 DefaultImporter:
   userData: 
   assetBundleName: