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
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