From f62949d11f08279d6289f0d53f2c4a6113f78786 Mon Sep 17 00:00:00 2001
From: Zaahir Moolla <moollaza@duckduckgo.com>
Date: Mon, 17 Oct 2016 17:17:17 -0400
Subject: [PATCH] Add issue template, update pr template

---
 .github/ISSUE_TEMPLATE.md        | 41 ++++++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 54 ++++++++++++++++++++++----------
 2 files changed, 79 insertions(+), 16 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..61f31a6ec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,41 @@
+<!--- Please use the appropriate format for your Issue title: -->
+
+<!-- For a Bug Fix: -->
+<!-- {IA Name} Bug: {Short description of bug} -->
+
+<!-- For a Suggestion:-->
+<!-- {IA Name} Suggestion: {Short description of suggestion}" -->
+
+<!-- For Everything Else: -->
+<!-- {IA Name}: {Short description} -->
+
+
+## Type of Issue
+
+<!-- Place and 'X' in the correct box (E.g `[X] Triggering`) -->
+
+- [ ] Bug (incorrect behavior)
+    - [ ] Triggering
+    - [ ] Relevancy
+    - [ ] Internal (issue with code)
+- [ ] Feature Request
+    - [ ] Triggers (new triggers)
+    - [ ] Design Change
+
+## Description
+
+<!-- Describe the bug, or suggestion in detail -->
+
+## Steps to recreate
+
+<!-- Describe the steps, or provide a link to an example search -->
+
+## People to notify
+
+<!-- Please @mention any relevant people/organizations here:-->
+
+
+---
+
+<!-- The Instant Answer ID can be found by clicking the `?` icon beside the Instant Answer result on DuckDuckGo.com -->
+Instant Answer Page: https://duck.co/ia/view/{ID}
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 76b7b5884..58b39e111 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,32 +1,54 @@
-###### What does your Pull Request do (check all that apply)?
+<!--- Please use the appropriate format for your Pull Request title: -->
 
-Choose the most relevant items and use the following title template to name
-your Pull Request.
+<!-- For a Bug Fix: -->
+<!-- {IA Name}: {Description of change} -->
+
+<!-- For a New Instant Answer: -->
+<!-- New {IA Name} Goodie" -->
+<!-- OR -->
+<!-- New {IA Name} CheatSheet" -->
+
+<!-- For anything else: -->
+<!-- {Tests/Docs/Other}: {Short Description} -->
+
+
+## Type of Change
+
+<!-- Place and 'X' in the correct box (E.g `[X] Improvement`) -->
 
 - [ ] New Instant Answer
-    - [ ] Cheat Sheets: **`New {Cheat Sheet Name} Cheat Sheet`**
-    - [ ] Other: **`New {IA Name} Instant Answer`**
+    - [ ] Cheat Sheet
 - [ ] Improvement
-    - [ ] Bug fix: **`{IA Name}: Fix {Issue number or one-line description}`**
-    - [ ] Enhancement: **`{IA Name}: {Description of Improvements}`**
+    - [ ] Bug fix
+    - [ ] Enhancement
 - [ ] Non–Instant Answer
-    - [ ] Other (Role, Template, Test, Documentation, etc.): **`{GoodieRole/Templates/Tests/Docs}: {Short Description}`**
+    - [ ] Other (Role, Template, Test, Documentation, etc.)
 
-###### Description of changes
+## Description of new Instant Answer, or changes
 
-What changes does this PR introduce? 
+<!-- What does this new Instant Answer do? -->
+<!-- OR -->
+<!-- What changes does this PR introduce? -->
 
-###### Related Issues or Discussions 
+## Related Issues and Discussions
 
-What issues or discussions (if any) does this PR address? Please provide the issue # or link.
+<!--- If fixing a bug with a related issue, please link to the issue here: -->
+<!-- E.g. "Fixes #1234" -->
 
-###### People to notify
+## People to notify
 
-@mention any relevant people/organizations
+<!-- Please @mention any relevant people/organizations here:-->
 
 
 ---
 
-Instant Answer Page: https://duck.co/ia/view/{{ID}}
+<!-- All new Instant Answers should be related to the Programming Mission -->
+<!-- They should also have a related Project on the DuckDuckHack Forum -->
+<!-- New Instant Answers related to the Programming Mission, without a forum topic will be put on hold -->
+<!-- 	More Info: https://forum.duckduckhack.com/t/duckduckhack-programming-mission-overview/53 -->
 
-[Maintainer](http://docs.duckduckhack.com/maintaining/guidelines.html): @mention
+Forum Topic:
+
+<!-- The Instant Answer ID can be found by clicking the `?` icon beside the Instant Answer result on DuckDuckGo.com -->
+
+IA Page: https://duck.co/ia/view/{ID}