use new sinatra version

Gemfile

@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'sinatra', '1.3.3'
+gem 'sinatra'
 gem 'haml'
 gem 'twitter'

Gemfile.lock

@@ -11,10 +11,10 @@ GEM
     rack-protection (1.5.0)
       rack
     simple_oauth (0.2.0)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
+    sinatra (1.4.3)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     tilt (1.4.1)
     twitter (4.8.1)
       faraday (~> 0.8, < 0.10)
@@ -26,5 +26,5 @@ PLATFORMS
 
 DEPENDENCIES
   haml
-  sinatra (= 1.3.3)
+  sinatra
   twitter

init.rb

@@ -5,7 +5,6 @@
 
 # require 'awesome_print'   # development mode
 
-
 set :current_conf, 'data-2013'
 set :planned_conf, []
 
@@ -154,17 +153,17 @@
 
 get '/:conf/register' do |conf|
   if settings.conferencies[conf][:reg_open]
-    set :conf, conf
-    set :page, 'register'
+    settings.set :conf, conf
+    settings.set :page, 'register'
     erb :"#{conf}/register"
   else
     redirect to("#{conf}/about")
   end
 end
 
 get '/:conf/:page' do |conf, page|
-  set :conf, conf
-  set :page, page
+  settings.set :conf, conf
+  settings.set :page, page
   erb :"#{conf}/#{page}"
 end