<NME> Gemfile.lock
<BEF> GEM
  remote: https://rubygems.org/
  specs:
    actionmailer (3.2.22.2)
      actionpack (= 3.2.22.2)
      mail (~> 2.5.4)
    actionpack (3.2.22.2)
      activemodel (= 3.2.22.2)
      activesupport (= 3.2.22.2)
      builder (~> 3.0.0)
      erubis (~> 2.7.0)
      journey (~> 1.0.4)
      rack (~> 1.4.5)
      rack-cache (~> 1.2)
      rack-test (~> 0.6.1)
      sprockets (~> 2.2.1)
    activemodel (3.2.22.2)
      activesupport (= 3.2.22.2)
      builder (~> 3.0.0)
    activerecord (3.2.22.2)
      activemodel (= 3.2.22.2)
      activesupport (= 3.2.22.2)
      arel (~> 3.0.2)
      tzinfo (~> 0.3.29)
    activeresource (3.2.22.2)
      activemodel (= 3.2.22.2)
      activesupport (= 3.2.22.2)
    activesupport (3.2.16)
      i18n (~> 0.6, >= 0.6.4)
      multi_json (~> 1.0)
    addressable (2.3.5)
    arel (3.0.3)
    bootstrap-sass (2.0.4.0)
    builder (3.0.4)
    capybara (1.1.4)
      mime-types (>= 1.16)
      nokogiri (>= 1.3.3)
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
      selenium-webdriver (~> 2.0)
      xpath (~> 0.1.4)
    childprocess (0.3.6)
      ffi (~> 1.0, >= 1.0.6)
    chosen-rails (0.9.8.3)
      railties (~> 3.0)
      thor (~> 0.14)
    coderay (1.1.0)
    coffee-rails (3.2.2)
      coffee-script (>= 2.2.0)
      coffee-script-source
    coffee-script (2.2.0)
      coffee-script-source
      execjs
    coffee-script-source (1.3.3)
    columnize (0.3.6)
    crack (0.3.1)
    daemons (1.1.9)
    database_cleaner (0.9.1)
    debugger (1.6.2)
      columnize (>= 0.3.1)
      debugger-linecache (~> 1.2.0)
      debugger-ruby_core_source (~> 1.2.3)
    debugger-linecache (1.2.0)
    debugger-ruby_core_source (1.2.4)
    diff-lcs (1.1.3)
    dotenv (0.4.0)
    dynamic_form (1.1.4)
    em-websocket (0.5.0)
      eventmachine (>= 0.12.9)
      http_parser.rb (~> 0.5.3)
    erubis (2.7.0)
    eventmachine (1.0.3)
    execjs (1.4.0)
      multi_json (~> 1.0)
    factory_girl (4.1.0)
      activesupport (>= 3.0.0)
    factory_girl_rails (4.1.0)
      factory_girl (~> 4.1.0)
      railties (>= 3.0.0)
    faraday (0.8.4)
      multipart-post (~> 1.1)
    faye-websocket (0.4.6)
      eventmachine (>= 0.12.0)
    ffi (1.3.1)
    github_api (0.7.0)
      faraday (~> 0.8.1)
      hashie (~> 1.2.0)
      multi_json (~> 1.3)
      nokogiri (~> 1.5.2)
      oauth2
    guard (1.6.1)
      listen (>= 0.6.0)
      lumberjack (>= 1.0.2)
      pry (>= 0.9.10)
      thor (>= 0.14.6)
    guard-livereload (1.1.3)
      em-websocket (>= 0.2.0)
      guard (>= 1.5.0)
      multi_json (~> 1.0)
    hashie (1.2.0)
    hike (1.2.3)
    http_parser.rb (0.5.3)
    i18n (0.6.9)
    journey (1.0.4)
    jquery-rails (2.1.3)
      railties (>= 3.1.0, < 5.0)
      thor (~> 0.14)
    jruby-pageant (1.1.1)
    json (1.8.1)
    kramdown (1.0.1)
    launchy (2.1.2)
      addressable (~> 2.3)
    libwebsocket (0.1.7.1)
      addressable
      websocket
    listen (0.7.1)
    localtunnel (0.3)
      json (>= 1.2.4)
      net-ssh (>= 2.0.22)
      net-ssh-gateway (>= 1.0.1)
    lumberjack (1.0.2)
    mail (2.5.4)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
    method_source (0.8.2)
    mime-types (1.25.1)
    multi_json (1.8.2)
    multipart-post (1.1.5)
    net-ssh (2.6.0)
      jruby-pageant (>= 1.1.1)
    net-ssh-gateway (1.1.0)
      net-ssh (>= 1.99.1)
    newrelic_rpm (3.6.0.78)
    nokogiri (1.5.6)
    oauth2 (0.5.2)
      faraday (~> 0.7)
      multi_json (~> 1.0)
    omniauth (1.1.0)
      hashie (~> 1.2)
      rack
    omniauth-github (1.0.1)
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.0)
    omniauth-oauth2 (1.0.0)
      oauth2 (~> 0.5.0)
      omniauth (~> 1.0)
    paul_revere (1.1)
      rails (~> 3.0)
    pg (0.14.1)
    poltergeist (1.0.2)
      capybara (~> 1.1)
      childprocess (~> 0.3)
      faye-websocket (~> 0.4, >= 0.4.4)
      http_parser.rb (~> 0.5.3)
      multi_json (~> 1.0)
    polyglot (0.3.3)
    pry (0.9.12.4)
      coderay (~> 1.0)
      method_source (~> 0.8)
      slop (~> 3.4)
    pry-debugger (0.2.2)
      debugger (~> 1.3)
      pry (~> 0.9.10)
    pry-rails (0.2.2)
      pry (>= 0.9.10)
    pry-remote (0.1.6)
      pry (~> 0.9)
      slop (~> 3.0)
    rack (1.4.5)
    rack-cache (1.2)
      rack (>= 0.4)
    rack-canonical-host (0.0.8)
      addressable
      rack (~> 1.0)
    rack-ssl (1.3.3)
      rack
    rack-test (0.6.2)
      rack (>= 1.0)
      rake (>= 0.8.7)
      rdoc (~> 3.4)
      thor (>= 0.14.6, < 2.0)
    rake (11.1.2)
    rb-fsevent (0.9.4)
    rb-inotify (0.9.3)
      ffi (>= 0.5.0)
    rdoc (3.12.2)
      json (~> 1.4)
    rspec-collection_matchers (1.1.2)
      rspec-expectations (>= 2.99.0.beta1)
    rspec-core (2.99.2)
      rake (>= 0.8.7)
      rdoc (~> 3.4)
      thor (>= 0.14.6, < 2.0)
    rake (10.1.0)
    rb-fsevent (0.9.3)
    rdoc (3.12.2)
      json (~> 1.4)
    rspec-core (2.12.2)
    rspec-expectations (2.12.1)
      diff-lcs (~> 1.1.3)
    rspec-mocks (2.12.1)
    rspec-rails (2.12.2)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      railties (>= 3.0)
      rspec-core (~> 2.12.0)
      rspec-expectations (~> 2.12.0)
      rspec-mocks (~> 2.12.0)
    rubyzip (0.9.9)
    sass (3.2.1)
    sass-rails (3.2.5)
      railties (~> 3.2.0)
      sass (>= 3.1.10)
      tilt (~> 1.3)
    selenium-webdriver (2.27.2)
      childprocess (>= 0.2.5)
      libwebsocket (~> 0.1.3)
      multi_json (~> 1.0)
      rubyzip
    shoulda-matchers (1.3.0)
      activesupport (>= 3.0.0)
    simplecov (0.7.1)
      multi_json (~> 1.0)
      simplecov-html (~> 0.7.1)
    simplecov-html (0.7.1)
    slop (3.4.7)
    sprockets (2.2.2)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
    thin (1.5.0)
      daemons (>= 1.0.9)
      eventmachine (>= 0.12.6)
      rack (>= 1.0.0)
    thor (0.18.1)
    tilt (1.4.1)
    treetop (1.4.15)
      polyglot
      polyglot (>= 0.3.1)
    tzinfo (0.3.38)
    uglifier (1.3.0)
      execjs (>= 0.3.0)
      multi_json (~> 1.0, >= 1.0.2)
    webmock (1.8.7)
      addressable (>= 2.2.7)
      crack (>= 0.1.7)
    websocket (1.0.6)
    xpath (0.1.4)
      nokogiri (~> 1.3)

PLATFORMS
  ruby

DEPENDENCIES
  bootstrap-sass
  capybara
  chosen-rails
  coffee-rails (~> 3.2.1)
  github_api
  guard-livereload
  httplog
  jquery-rails
  kramdown
  launchy
  newrelic_rpm
  omniauth
  omniauth-github
  paul_revere
  pg
  poltergeist
  pry
  pry-rails
  pry-remote
  pg
  poltergeist
  pry
  pry-debugger
  pry-rails
  pry-remote
  rack-canonical-host
  rails (= 3.2.16)
  rb-fsevent (~> 0.9.1)
  rspec-rails (~> 2.0)
  sass-rails (~> 3.2.3)
  shoulda-matchers
  simplecov

RUBY VERSION
   ruby 2.1.9p490

BUNDLED WITH
   1.12.4

<MSG> Merge branch 'updated_gemfile_and_deploy' into heroku

<DFF> @@ -28,22 +28,30 @@ GEM
     activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
+    addressable (2.3.6)
     arel (3.0.3)
-    bootstrap-sass (2.0.4.0)
+    atomic (1.1.16)
+    bootstrap-sass (2.3.2.2)
+      sass (~> 3.2)
     builder (3.0.4)
-    capybara (1.1.4)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    chosen-rails (0.9.8.3)
-      railties (~> 3.0)
-      thor (~> 0.14)
+      xpath (~> 2.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    chosen-rails (1.1.0)
+      coffee-rails (>= 3.2)
+      compass-rails (>= 1.1.2)
+      railties (>= 3.0)
+      sass-rails (>= 3.2)
+    chunky_png (1.3.0)
+    cliver (0.3.2)
     coderay (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -51,128 +59,141 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
-    columnize (0.3.6)
-    crack (0.3.1)
+    coffee-script-source (1.7.0)
+    compass (0.12.4)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.2.17)
+    compass-rails (1.1.7)
+      compass (>= 0.12.2)
+      sprockets (<= 2.11.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     daemons (1.1.9)
-    database_cleaner (0.9.1)
-    debugger (1.6.2)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
+    database_cleaner (1.2.0)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.4)
-    diff-lcs (1.1.3)
-    dotenv (0.4.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    dotenv (0.10.0)
     dynamic_form (1.1.4)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.1.0)
+    execjs (2.0.2)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.4.1)
+      factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
-    faye-websocket (0.4.6)
-      eventmachine (>= 0.12.0)
-    ffi (1.3.1)
-    github_api (0.7.0)
-      faraday (~> 0.8.1)
-      hashie (~> 1.2.0)
-      multi_json (~> 1.3)
-      nokogiri (~> 1.5.2)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    fssm (0.2.10)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
-    guard (1.6.1)
-      listen (>= 0.6.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-livereload (1.1.3)
-      em-websocket (>= 0.2.0)
-      guard (>= 1.5.0)
-      multi_json (~> 1.0)
-    hashie (1.2.0)
+    guard (2.6.0)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-livereload (2.1.2)
+      em-websocket (~> 0.5)
+      guard (~> 2.0)
+      multi_json (~> 1.8)
+    hashie (2.0.5)
     hike (1.2.3)
     http_parser.rb (0.5.3)
     i18n (0.6.9)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    jruby-pageant (1.1.1)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.8.1)
-    kramdown (1.0.1)
-    launchy (2.1.2)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    kramdown (1.3.3)
+    launchy (2.4.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    listen (0.7.1)
+    listen (2.7.1)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
     localtunnel (0.3)
       json (>= 1.2.4)
       net-ssh (>= 2.0.22)
       net-ssh-gateway (>= 1.0.1)
-    lumberjack (1.0.2)
+    lumberjack (1.0.5)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    multi_json (1.8.2)
-    multipart-post (1.1.5)
-    net-ssh (2.6.0)
-      jruby-pageant (>= 1.1.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    newrelic_rpm (3.6.0.78)
-    nokogiri (1.5.6)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
-    omniauth (1.1.0)
-      hashie (~> 1.2)
-      rack
-    omniauth-github (1.0.1)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.0)
-    omniauth-oauth2 (1.0.0)
-      oauth2 (~> 0.5.0)
+    mini_portile (0.5.3)
+    multi_json (1.9.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    net-ssh (2.8.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    newrelic_rpm (3.7.3.204)
+    nio4r (1.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    omniauth (1.2.1)
+      hashie (>= 1.2, < 3)
+      rack (~> 1.0)
+    omniauth-github (1.1.1)
       omniauth (~> 1.0)
-    paul_revere (1.1)
-      rails (~> 3.0)
-    pg (0.14.1)
-    poltergeist (1.0.2)
-      capybara (~> 1.1)
-      childprocess (~> 0.3)
-      faye-websocket (~> 0.4, >= 0.4.4)
-      http_parser.rb (~> 0.5.3)
+      omniauth-oauth2 (~> 1.1)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
+    paul_revere (1.2)
+      rails (>= 3.0)
+    pg (0.17.1)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
       multi_json (~> 1.0)
-    polyglot (0.3.3)
-    pry (0.9.12.4)
+      websocket-driver (>= 0.2.0)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
-    pry-rails (0.2.2)
+    pry-rails (0.3.2)
       pry (>= 0.9.10)
-    pry-remote (0.1.6)
+    pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-canonical-host (0.0.8)
+    rack-canonical-host (0.0.9)
       addressable
       rack (~> 1.0)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -191,69 +212,71 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
+    rake (10.2.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    rspec-rails (2.12.2)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rubyzip (0.9.9)
-    sass (3.2.1)
-    sass-rails (3.2.5)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    safe_yaml (1.0.1)
+    sass (3.2.18)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.27.2)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    shoulda-matchers (1.3.0)
+    shoulda-matchers (2.5.0)
       activesupport (>= 3.0.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.7)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.5.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thin (1.5.0)
+    thin (1.6.2)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
+    timers (1.1.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-    uglifier (1.3.0)
+    tzinfo (0.3.39)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    webmock (1.8.7)
+      json (>= 1.8.0)
+    webmock (1.17.4)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    websocket (1.0.6)
-    xpath (0.1.4)
+      crack (>= 0.3.2)
+    websocket-driver (0.3.2)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap-sass
+  bootstrap-sass (~> 2.0)
   capybara
   chosen-rails
   coffee-rails (~> 3.2.1)
@@ -275,13 +298,13 @@ DEPENDENCIES
   pg
   poltergeist
   pry
-  pry-debugger
   pry-rails
   pry-remote
   rack-canonical-host
   rails (= 3.2.16)
   rb-fsevent (~> 0.9.1)
   rspec-rails (~> 2.0)
+  sass (~> 3.2.0)
   sass-rails (~> 3.2.3)
   shoulda-matchers
   simplecov

Merge branch 'updated_gemfile_and_deploy' into heroku