diff --git a/Gemfile b/Gemfile
index 4ede41618..69333230c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,6 +59,7 @@ group :development, :test do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'awesome_print'
+  gem 'rubocop', require: false
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 52148b85b..ab5d72a08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,6 +42,7 @@ GEM
     ansi (1.5.0)
     arel (6.0.3)
     aspector (0.14.0)
+    ast (2.3.0)
     autoprefixer-rails (6.1.2)
       execjs
       json
@@ -170,8 +171,11 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
     pg (0.18.4)
     pkg-config (1.1.7)
+    powerpack (0.1.1)
     puma (2.15.3)
     rack (1.6.4)
     rack-test (0.6.3)
@@ -205,6 +209,7 @@ GEM
       activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.1.0)
     rake (11.2.2)
     rdoc (4.2.0)
     redcarpet (3.3.3)
@@ -217,7 +222,13 @@ GEM
     roo (2.1.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
-    ruby-progressbar (1.8.1)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+			ruby-progressbar (1.8.1)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     rubyzip (1.1.7)
     sass (3.4.20)
     sass-rails (5.0.4)
@@ -255,6 +266,7 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.8.3)
+    unicode-display_width (1.1.0)
     warden (1.2.6)
       rack (>= 1.0)
     web-console (2.2.1)
@@ -314,6 +326,7 @@ DEPENDENCIES
   remotipart (~> 1.2)
   rgl
   roo (~> 2.1.0)
+  rubocop
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   shoulda-context