diff --git a/Gemfile b/Gemfile
index 3b05fb9..8bf74fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ ruby '2.0.0'
 gem 'rails', '4.0.0.rc2'
 
 # Servers
-gem 'thin'
+gem 'puma'
 gem 'unicorn'
 
 # Multi-environment configuration
@@ -39,10 +39,10 @@ gem 'handlebars_assets'
 gem 'i18n-js'
 gem 'jquery-turbolinks'
 gem 'less-rails'
-gem 'sass-rails', '~> 4.0.0.rc1'
+gem 'sass-rails', '~> 4.0.0.rc2'
 gem 'therubyracer'
 gem 'turbolinks'
-gem 'twitter-bootstrap-rails'
+gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.2.0'
 gem 'uglifier', '>= 1.3.0'
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index eaefc65..3f12319 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,14 @@
-<<<<<<< HEAD
 GIT
-  remote: git://github.com/bmabey/database_cleaner.git
-  revision: 20136e8987c222013d96e07c27d1230d2bbebd61
-  ref: 20136e89
+  remote: git://github.com/diowa/twitter-bootstrap-rails.git
+  revision: bfc3bfecf6ff0e47a12c7ca25702edd44a4f6ed8
+  branch: fontawesome-3.2.0
   specs:
-    database_cleaner (0.9.1)
+    twitter-bootstrap-rails (2.2.7)
+      actionpack (>= 3.1)
+      execjs
+      rails (>= 3.1)
+      railties (>= 3.1)
 
-=======
->>>>>>> hotfix/0.4.1
 GEM
   remote: https://rubygems.org/
   specs:
@@ -75,7 +76,6 @@ GEM
       thor
     crack (0.4.0)
       safe_yaml (~> 0.9.0)
-    daemons (1.1.9)
     database_cleaner (1.0.1)
     debug_inspector (0.0.2)
     debugger (1.6.0)
@@ -91,7 +91,6 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.2)
     erubis (2.7.0)
-    eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.2.0)
@@ -154,6 +153,8 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.1)
       pry (>= 0.9.10)
+    puma (2.0.1)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
@@ -237,10 +238,6 @@ GEM
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.18.1)
     thread_safe (0.1.0)
       atomic
@@ -250,11 +247,6 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (1.2.0)
       coffee-rails
-    twitter-bootstrap-rails (2.2.7)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
     tzinfo (0.3.37)
     uglifier (2.1.1)
       execjs (>= 0.3.0)
@@ -303,19 +295,19 @@ DEPENDENCIES
   pg
   pry
   pry-rails
+  puma
   rails (= 4.0.0.rc2)
   resque
   rest-client
   rspec
   rspec-rails
-  sass-rails (~> 4.0.0.rc1)
+  sass-rails (~> 4.0.0.rc2)
   selenium-webdriver
   simpleconfig
   simplecov
   therubyracer
-  thin
   turbolinks
-  twitter-bootstrap-rails
+  twitter-bootstrap-rails!
   uglifier (>= 1.3.0)
   unicorn
   webmock
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index 5681cc0..3987672 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -12,7 +12,7 @@ body {
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
 @fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix");
+@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot?#iefix");
 @fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
 @fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
 @fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
@@ -24,4 +24,3 @@ body {
 //@import "twitter/bootstrap/sprites.less";
 
 // Override the default bootstrap variables in stubs/variables_overrides.css.less
-
diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml
index b00a460..67b7e02 100644
--- a/app/views/pages/home.html.haml
+++ b/app/views/pages/home.html.haml
@@ -1,7 +1,6 @@
 - title t('hello')
-%h1= t('hello')
-%h2
-  %i.icon-smile
-  Smile!
+%h1
+  %i.icon-sun
+  Here comes the sun
 %p.lead.muted
-  Ruby 2 + Rails 4.0.0.rc2 + Font Awesome 3.1.1
+  Ruby 2 + Rails 4.0.0.rc2 + Bootstrap 2.3.2 + Font Awesome 3.2.0