diff --git a/Assets/_Project/Definitions.meta b/Assets/_Project/Definitions.meta
index d3c452a..a2de22b 100644
--- a/Assets/_Project/Definitions.meta
+++ b/Assets/_Project/Definitions.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 01de85ee5d8a2014594d9910b1a6ff55
+=======
+guid: cf294cbfb17f5a5d7846479a116fc7b3
+>>>>>>> 31b0b5f (adding uncommited files (oops))
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/_Project/Definitions/Buffs.meta b/Assets/_Project/Definitions/Buffs.meta
new file mode 100644
index 0000000..98de849
--- /dev/null
+++ b/Assets/_Project/Definitions/Buffs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eef6329e4294d86c6978ff9453b56956
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/_Project/Definitions/Buffs/ExtraDamage25.asset b/Assets/_Project/Definitions/Buffs/ExtraDamage25.asset
new file mode 100644
index 0000000..c707eae
--- /dev/null
+++ b/Assets/_Project/Definitions/Buffs/ExtraDamage25.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b01f9aea62ee8a1c1991bb2a097de224, type: 3}
+  m_Name: ExtraDamage25
+  m_EditorClassIdentifier: Assembly-CSharp::TD.Gameplay.BuffDefinition
+  DisplayName: 25% Increased Damage
+  Stat: 0
+  Multiplier: 1.25
diff --git a/Assets/_Project/Definitions/Buffs/ExtraDamage25.asset.meta b/Assets/_Project/Definitions/Buffs/ExtraDamage25.asset.meta
new file mode 100644
index 0000000..b240b6c
--- /dev/null
+++ b/Assets/_Project/Definitions/Buffs/ExtraDamage25.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9ec170e540b1f91cca762dcebe81a856
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/_Project/Definitions/Buffs/OffensiveBuffs.asset b/Assets/_Project/Definitions/Buffs/OffensiveBuffs.asset
new file mode 100644
index 0000000..737c5ab
--- /dev/null
+++ b/Assets/_Project/Definitions/Buffs/OffensiveBuffs.asset
@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 516e8faec948a4b3d977ec019376c438, type: 3}
+  m_Name: OffensiveBuffs
+  m_EditorClassIdentifier: Assembly-CSharp::TD.Gameplay.BuffCategory
+  DisplayName: Offensive Buffs
+  Cost: 5
+  Pool:
+  - {fileID: 11400000, guid: 9ec170e540b1f91cca762dcebe81a856, type: 2}
diff --git a/Assets/_Project/Definitions/Buffs/OffensiveBuffs.asset.meta b/Assets/_Project/Definitions/Buffs/OffensiveBuffs.asset.meta
new file mode 100644
index 0000000..ced41c2
--- /dev/null
+++ b/Assets/_Project/Definitions/Buffs/OffensiveBuffs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d8ed3b9535538f7fc82be878cc307d26
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: