Merge pull request #1415 from edx/db/gemfile-lock

Commiting Gemfile.lock to the repository

.gitignore

@@ -41,7 +41,6 @@ reports/
 
 ### Installation artifacts
 *.egg-info
-Gemfile.lock
 .pip_download_cache/
 .prereqs_cache
 .vagrant/

Gemfile.lock

@@ -0,0 +1,35 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.5)
+    bourbon (3.1.8)
+      sass (>= 3.2.0)
+      thor
+    colorize (0.5.8)
+    ffi (1.9.0)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    neat (1.4.0)
+      bourbon (>= 2.1)
+      sass (>= 3.2)
+    rake (10.0.4)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
+      ffi (>= 0.5.0)
+    sass (3.2.12)
+    sys-proctable (0.9.3)
+    thor (0.18.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bourbon (~> 3.1.8)
+  colorize (~> 0.5.8)
+  launchy (~> 2.1.2)
+  neat (~> 1.4.0)
+  rake (~> 10.0.3)
+  rb-fsevent (~> 0.9.3)
+  rb-inotify (~> 0.9)
+  sass (= 3.2.12)
+  sys-proctable (~> 0.9.3)