From f19926d6a2e3a7ee8a7af4b8a7d91bc2b9da9eab Mon Sep 17 00:00:00 2001
From: "Brian V. Hughes" <brian@brianvhughes.com>
Date: Wed, 28 May 2014 17:48:51 -0700
Subject: [PATCH 1/2] Add .ruby-version and .gitignore

---
 .gitignore    | 1 +
 .ruby-version | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .ruby-version

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9dc2b05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.ruby-gemset
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..7c32728
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.1.1
\ No newline at end of file

From dca230109fb15a0fae1e7135d5d61f431b67b42b Mon Sep 17 00:00:00 2001
From: "Brian V. Hughes" <brian@brianvhughes.com>
Date: Wed, 28 May 2014 17:49:36 -0700
Subject: [PATCH 2/2] Update server to use :public_folder over :public

---
 server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.rb b/server.rb
index 224ff4a..dda950e 100644
--- a/server.rb
+++ b/server.rb
@@ -2,7 +2,7 @@
 require 'slim'
 
 class Conduct < Sinatra::Base
-  set :public, File.dirname(__FILE__) + '/public'
+  set :public_folder, File.dirname(__FILE__) + '/public'
   set :views, File.dirname(__FILE__) + '/views'
 
   get '/' do