Fix conflicts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report of any bug you find
+title: "[Bug Report]"
+labels: ''
+assignees: ''
+
+---
+
+NOTE TO ISSUE CREATOR - If you are a Discord user, please head to my Discord server at https://discord.gg/CsHF5GX and ask about reporting a bug with my specially-made Bug Bot. If you are not a Discord user, please proceed to create a report with the following template:
+
+### Short description
+Here you will need to provide a brief description of the bug you've found.
+
+### Steps to reproduce
+- Step 1
+- Step 2
+- You get the idea
+
+### Expected result
+What is *supposed* to happen but isn't happening?
+
+### Actual result
+Pretty self-explanatory.
+
+**Software version:** the version of the particular software you're using (e.g. Artemis v3.0.0-alpha)
+**System settings:** information about your system specs (i.e. OS version and build)

README.md

@@ -2,6 +2,8 @@
 
 Captain is my own personal take on a cross between GearBot and Rowboat. Of course, this bot is still in development and will be for a very long time.
 
+**If you need support or wish to report a bug, please join my Discord server: https://discord.gg/CsHF5GX**
+
 ## Features
 
 You didn't come here to listen to me chatter about the unimportant stuff, you want the feature list, well here it is:
@@ -40,4 +42,4 @@ Yup! Though only for public servers since my hosting resources are limited. If y
 
 ## Running your own instance
 
-For help with installing Captain on your server, see my [official setup guide](https://docs.jacktek.net/captain/getting-started).
+For help with installing Captain on your server, see my [official setup guide](https://docs.jacktek.net/captain/getting-started).