Adding docs that will build via Github Pages (tableau#100)

t8y8 · Russell Hay · commit 2e3554722f71 · 2016-11-01T14:00:34.000-07:00
* Jekyll Dependencies
* First draft of docs -- we'll improve once skeleton is in place
* Does not deploy yet, need to do that in github settings page
diff --git a/docs/docs/dev-guide.md b/docs/docs/dev-guide.md
@@ -3,6 +3,7 @@ title: Developer Guide
 layout: docs
 ---
 
+<<<<<<< 6ee666bf06d5ab59931100b3955779c35693e33f
 ## Submitting your first patch
 
 1. Make sure you have [signed the CLA](http://tableau.github.io/#contributor-license-agreement-cla)
