Merge branch 'master' of https://github.com/tmcpro/hackathon-starter

# By Tyler McIntyre
# Via Tyler McIntyre
* 'master' of https://github.com/tmcpro/hackathon-starter:
  Added to Readme file
  Stripe API finished
  stripe API added

Conflicts:
	package.json
	views/api/index.jade

views/api/index.jade

@@ -4,6 +4,7 @@ block content
   h2 API Examples
   hr
 
+<<<<<<< HEAD
   .row.api-examples
     .col-sm-4
       .panel.panel-default
@@ -55,6 +56,11 @@ block content
         .panel-body
           img(src='http://th08.deviantart.net/fs4/200H/i/2004/242/4/7/Steam_Icon.png', height=40)
           a(href='/api/steam') Steam
+    .col-sm-4
+      .panel.panel-default
+        .panel-body
+          img(src='https://stripe.com/img/open-graph/logo.png', height=40)
+          a(href='/api/stripe') Stripe
     .col-sm-4
       .panel.panel-default
         .panel-body
@@ -79,4 +85,4 @@ block content
       .panel.panel-default
         .panel-body
           img(src='http://www.mevvy.com/wp-content/uploads/2013/09/Venmo-Logo-on-Mevvy.com_.png', height=40)
-          a(href='/api/venmo') Venmo
+          a(href='/api/venmo') Venmo

views/api/stripe.jade

@@ -0,0 +1,10 @@
+extends ../layout
+
+block content
+  h2 Stripe API
+
+  ol
+    li
+      a(href='/api/stripe/onetime') One Time Charges
+    li
+      a(href='/api/stripe/newsubscriber') New Subscriber