diff --git a/Gemfile b/Gemfile
index 54edc1b..7b65240 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,9 @@ gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0',          group: :doc
 
+gem 'bootstrap-sass', '~> 3.3.1'
+gem 'autoprefixer-rails'
+
 gem 'will_paginate', '~> 3.0.6'
 gem 'will_paginate-bootstrap'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e5af27d..a9737f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,6 +28,10 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
+    autoprefixer-rails (4.0.2.1)
+      execjs
+    bootstrap-sass (3.3.1.0)
+      sass (~> 3.2)
     builder (3.2.2)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -112,6 +116,8 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  autoprefixer-rails
+  bootstrap-sass (~> 3.3.1)
   coffee-rails (~> 4.0.0)
   jbuilder (~> 2.0)
   jquery-rails
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d6925fa..6ef234e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,4 +13,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
+//= require bootstrap-sprockets
 //= require_tree .
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss
similarity index 92%
rename from app/assets/stylesheets/application.css
rename to app/assets/stylesheets/application.css.scss
index a443db3..4b83bcd 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css.scss
@@ -13,3 +13,6 @@
  *= require_tree .
  *= require_self
  */
+
+@import "bootstrap-sprockets";
+@import "bootstrap";
diff --git a/app/assets/stylesheets/problems.css.scss b/app/assets/stylesheets/problems.css.scss
index 440f713..7f0de10 100644
--- a/app/assets/stylesheets/problems.css.scss
+++ b/app/assets/stylesheets/problems.css.scss
@@ -1,3 +1,3 @@
 // Place all the styles related to the Problems controller here.
-// They will automatically be included in application.css.
+// They will automatically be included in application.css.scss.
 // You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index d2f4ec3..ab212d0 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -4,5 +4,5 @@
 Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# application.js, application.css.scss, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )