From 642b9e8cd5014017cd7258dec178575d1db090c1 Mon Sep 17 00:00:00 2001
From: aldenpeterson-wf <alden.peterson@workiva.com>
Date: Tue, 27 Jun 2017 11:27:48 -0500
Subject: [PATCH 1/2] Add GH issue template and update readme

---
 .github/ISSUE_TEMPLATE.md | 24 ++++++++++++++++++++++++
 README.md                 |  7 +++++++
 2 files changed, 31 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..f56c7ce592
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,24 @@
+<!-- For general questions about how to use Locust, use either the Slack link provided in the Readme or [ask a question on Stack Overflow](https://stackoverflow.com/questions/ask) tagged Locust.-->
+
+
+### Description of issue
+
+TBD
+
+### Expected behavior
+
+TBD
+
+### Actual behavior
+
+TBD
+
+### Environment settings
+
+- OS:
+- Python version:
+- Locust version:
+
+### Steps to reproduce
+
+TBD - [example code appreciated](https://stackoverflow.com/help/mcve)
\ No newline at end of file
diff --git a/README.md b/README.md
index 0b89e3bd62..f70c4d65da 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,13 @@ of callbacks, your code looks and behaves like normal, blocking Python code.
 
 More info and documentation can be found at: <a href="http://docs.locust.io/">http://docs.locust.io/</a>
 
+## Questions/help?
+
+For questions about how to use Locust, feel free to stop by the Slack or ask questions on Stack Overflow tagged Locust.
+
+## Bug reporting
+
+Open a Github issue and follow the template listed there.
 
 ## Authors
 

From e13f92715237466fa80d5aadbd127e6a0cacc5e3 Mon Sep 17 00:00:00 2001
From: aldenpeterson-wf <alden.peterson@workiva.com>
Date: Tue, 27 Jun 2017 16:07:59 -0500
Subject: [PATCH 2/2] Update template for feature requests

---
 .github/ISSUE_TEMPLATE.md | 6 +++---
 README.md                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index f56c7ce592..8ad5c3321d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!-- For general questions about how to use Locust, use either the Slack link provided in the Readme or [ask a question on Stack Overflow](https://stackoverflow.com/questions/ask) tagged Locust.-->
 
 
-### Description of issue
+### Description of issue / feature request
 
 TBD
 
@@ -13,12 +13,12 @@ TBD
 
 TBD
 
-### Environment settings
+### Environment settings (for bug reports)
 
 - OS:
 - Python version:
 - Locust version:
 
-### Steps to reproduce
+### Steps to reproduce (for bug reports)
 
 TBD - [example code appreciated](https://stackoverflow.com/help/mcve)
\ No newline at end of file
diff --git a/README.md b/README.md
index f70c4d65da..f6a575f42b 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ More info and documentation can be found at: <a href="http://docs.locust.io/">ht
 
 For questions about how to use Locust, feel free to stop by the Slack or ask questions on Stack Overflow tagged Locust.
 
-## Bug reporting
+## Bug reporting or feature requests
 
 Open a Github issue and follow the template listed there.