From 763ff653ef769d204e055b210cc086c3728b4bf8 Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Tue, 15 Mar 2016 11:48:53 -0400
Subject: [PATCH] edit to issue template and new pull request template

---
 ISSUE_TEMPLATE.md        | 8 ++++----
 PULL_REQUEST_TEMPLATE.md | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 PULL_REQUEST_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index fd21466ae..489567c94 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,15 +1,15 @@
-##What happened just before the problem occurred
+### What happened just before the problem occurred
 
 
-##Relevant URLs
+### Relevant URLs
 
 https://
 
-##PublicLab.org username
+### PublicLab.org username
 
 (to help reproduce the issue)
 
-##Browser, version, and operating system
+### Browser, version, and operating system
 
 
 For bug reports, fill out the above template; for feature requests, you can delete the template.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..9e326e5bd
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
+Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!
+
+* [ ] tests pass -- `rake test`
+* [ ] code has been rebased on top of latest master (check if another pull request was added recently, and please rebase)
+* [ ] pull request is descriptively named and, if possible, multiple commits squashed if they're smaller changes
+
+Thanks!