Merge branch 'master' into fight-fixes

# Conflicts:
#	fight/__init__.py
#	fight/fight.py
#	fight/info.json

fight/__init__.py

@@ -0,0 +1,6 @@
+from .fight import Fight
+
+
+def setup(bot):
+    n = Fight(bot)
+    bot.add_cog(n)

fight/info.json

@@ -0,0 +1,25 @@
+{
+  "author": [
+    "Bobloy"
+  ],
+  "bot_version": [
+    3,
+    0,
+    0
+  ],
+  "description": "[Incomplete] Cog to organize tournaments within Discord",
+  "hidden": true,
+  "install_msg": "Thank you for installing Fight. Run with [p]fight or [p]fightset",
+  "requirements": [],
+  "short": "[Incomplete] Cog to organize tournaments",
+  "tags": [
+    "game",
+    "fun",
+    "fight",
+    "tournament",
+    "tourney",
+    "elimination",
+    "bracket",
+    "bobloy"
+  ]
+}