Resolved merge conflicts

Author: JannikEmmerich

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,18 @@
+---
+name: Bug Report
+about: Create a bug report to help us improve Cryptic.
+labels: bug
+
+---
+
+**Describe the bug**
+> Please provide a clear and concise description of what the bug is.
+
+**Reproduce**
+> Steps to reproduce the behavior.
+
+**Logs**
+> Please provide your logs and/or screenshots of the problem.
+
+**Additional Comments**
+> Add any other context about the problem here.

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,15 @@
+---
+name: Feature Request
+about: If you'd like to make a suggestion please fill out the form below.
+labels: enhancement
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+> Please provide a clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+> Please provide a clear and concise description of what you want to happen.
+
+**Additional Comments**
+> Add any other context about the feature request here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,33 +1,11 @@
-<!--- Provide a general summary of your changes in the Title above -->
+**Description**
+> Provide a description of what your changes do.
 
-## Description
-<!--- Describe your changes in detail -->
+**Issue**
+Closes #XX
 
-## Related Issue
-<!--- This project only accepts pull requests related to open issues -->
-<!--- If suggesting a new feature or change, please discuss it in an issue first -->
-<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
-<!--- Please link to the issue here: -->
+**Testing Instructions**
+> Give us step by step instructions on how to test your changes.
 
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Screenshots (if appropriate):
-
-## Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the code style of this project.
-- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly.
+**Additional Notes**
+> Add any other context about the pull request here.