diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..8e6e3d60
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,12 @@
+### Summary:
+
+### Steps to reproduce:
+
+ 1.
+ 2.
+ 3.
+
+### Expected behavior:
+
+### Additional notes:
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..65d6fe91
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+Fixes #[issue number].
+
+Changes proposed:
+-
+-
+-
+
+Upgrade Path (for changed or removed APIs):
+
+
+Acceptance Checklist:
+[ ] All commits have been squashed to one.
+[ ] The commit message follows the guidlines in `CONTRIBUTING.md`.
+[ ] Documentation (README.md) and examples have been updated as needed.
+[ ] If this is a code change, a spec testing the functionality has been added.
+[ ] If the commit message has [changed] or [removed], there is an upgrade path above.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4faf145d..5ea35781 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ always be in sync.
 ### Development
 
 - `npm start` runs the dev server to run/develop examples
-- `npm test` will run the test.
+- `npm test` will run the tests.
 - `scripts/test` same as `npm test` but keeps karma running and watches
   for changes