diff --git a/Gemfile b/Gemfile
index 69ca110..00fb83d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,6 +60,7 @@ group :development, :test do
   gem 'pry-rails'
   gem 'pry-byebug', platforms: [:mri]
   gem 'quiet_assets'
+  gem 'rubocop', require: false
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 44b1973..65c4068 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,6 +45,9 @@ GEM
       builder
       multi_json
     arel (6.0.3)
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     bcrypt (3.1.10)
     bcrypt (3.1.10-java)
     better_errors (2.1.1)
@@ -226,6 +229,8 @@ GEM
       omniauth (~> 1.2)
     origin (2.1.1)
     orm_adapter (0.5.0)
+    parser (2.2.3.0)
+      ast (>= 1.1, < 3.0)
     pjax_rails (0.4.0)
       jquery-rails
       railties (>= 3.2, < 5.0)
@@ -235,6 +240,7 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     power_assert (0.2.3)
+    powerpack (0.1.1)
     premailer (1.8.4)
       css_parser (>= 1.3.6)
       htmlentities (>= 4.0.0)
@@ -293,6 +299,7 @@ GEM
       activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.0.0)
     raindrops (0.13.0)
     rake (10.4.2)
     ref (1.0.5)
@@ -332,6 +339,13 @@ GEM
       rspec-mocks (~> 3.3.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
+    rubocop (0.34.2)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.2.5, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.7.5)
     rushover (0.3.0)
       json
       rest-client
@@ -461,6 +475,7 @@ DEPENDENCIES
   rspec-activemodel-mocks
   rspec-its
   rspec-rails (~> 3.0)
+  rubocop
   rushover
   sass-rails
   test-unit
@@ -472,3 +487,6 @@ DEPENDENCIES
   useragent
   xmpp4r
   yajl-ruby
+
+BUNDLED WITH
+   1.10.6
--
libgit2 0.21.2