Merge remote-tracking branch 'upstream/master' into original-repo

Conflicts:
	Gemfile.lock
	README.md
	app.rb
	lib/contents.rb
	lib/doc_page.rb
	lib/step.rb
	public/css/doc_page.css
	public/css/toc.scss
	public/js/doc_page.js
	sites/curriculum/allow_people_to_vote.step
	sites/docs/docs.step
	sites/installfest/_switch_to_home_directory.step
	sites/installfest/create_and_deploy_a_rails_app.step
	sites/installfest/get_a_sticker.step
	sites/javascript/javascript.step
	sites/javascript/javascript_not_java.step
	spec/step_spec.rb

Gemfile

@@ -1,24 +1,23 @@
 source "https://rubygems.org"
 
-gem 'active_support'
-gem "erector", "~>0.9.0"
-gem "sinatra"
+gem 'activesupport', '~> 3.2.0'
+gem "erector", "~> 0.9.0"
+gem "sinatra", "~> 1.3.0"
 gem "nokogiri"
 gem "thin"
 gem "eventmachine", "~>1.0.3"
 gem 'rack-codehighlighter'
 gem 'coderay'
-gem "deckrb", ">=0.3.0"
+gem "deckrb", "~> 0.5.2"
 gem "sass"
 gem "redcarpet"
 
 group :development do
-  gem "wrong", ">=0.6.2"
+  gem "wrong", "~> 0.7.0"
   gem "rspec"
   gem "rerun"
   gem "rake"
   gem "rack-test"
-  gem "files", ">=0.3.0"
-  gem "bourbon"  # do 'cd public/css; bourbon update' to get new bourbon
+  gem "files", "~> 0.3.0"
   gem 'rb-fsevent', :platform => :ruby
 end

Gemfile.lock

@@ -1,15 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    bourbon (3.0.1)
-      sass (>= 3.2.0)
-      thor
-    coderay (1.0.8)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    coderay (1.1.0)
     daemons (1.1.9)
-    deckrb (0.5.0)
+    deckrb (0.5.2)
       coderay
       erector (>= 0.9.0)
       json
@@ -19,62 +16,75 @@ GEM
       redcarpet (~> 2)
       thin
       trollop
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     erector (0.9.0)
       treetop (>= 1.2.3)
     eventmachine (1.0.3)
     eventmachine (1.0.3-x86-mingw32)
+    ffi (1.9.3)
+    ffi (1.9.3-x86-mingw32)
     files (0.3.1)
-    json (1.7.6)
-    listen (0.7.2)
-    nokogiri (1.5.6)
-    nokogiri (1.5.6-x86-mingw32)
+    i18n (0.6.5)
+    json (1.8.1)
+    listen (1.0.3)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.1-x86-mingw32)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     predicated (0.2.6)
     rack (1.5.2)
     rack-codehighlighter (0.5.0)
       nokogiri (>= 1.4.1)
       rack (>= 1.0.0)
-    rack-protection (1.3.2)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
-    redcarpet (2.2.2)
-    rerun (0.8.0)
-      listen
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    ruby2ruby (2.0.3)
+    rb-inotify (0.9.2)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
+    redcarpet (2.3.0)
+    rerun (0.8.2)
+      listen (~> 1.0.3)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    ruby2ruby (2.0.7)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.1.1)
+    ruby_parser (3.2.2)
       sexp_processor (~> 4.1)
-    sass (3.2.5)
-    sexp_processor (4.1.4)
+    sass (3.2.12)
+    sexp_processor (4.4.1)
     sinatra (1.3.4)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    thin (1.5.0)
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     trollop (2.0)
-    wrong (0.7.0)
-      diff-lcs (~> 1.1.2)
+    wrong (0.7.1)
+      diff-lcs (~> 1.2.5)
       predicated (~> 0.2.6)
       ruby2ruby (>= 2.0.1)
       ruby_parser (>= 3.0.1)
@@ -85,13 +95,12 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  active_support
-  bourbon
+  activesupport (~> 3.2.0)
   coderay
-  deckrb (>= 0.3.0)
+  deckrb (~> 0.5.2)
   erector (~> 0.9.0)
   eventmachine (~> 1.0.3)
-  files (>= 0.3.0)
+  files (~> 0.3.0)
   nokogiri
   rack-codehighlighter
   rack-test
@@ -101,6 +110,6 @@ DEPENDENCIES
   rerun
   rspec
   sass
-  sinatra
+  sinatra (~> 1.3.0)
   thin
-  wrong (>= 0.6.2)
+  wrong (~> 0.7.0)

LICENSE.md

@@ -0,0 +1,40 @@
+The documentation (including anything under the `sites` subdir as well as some hardcoded text elsewhere) is licensed under a Creative Commons license ([CC-BY,  specifically](http://creativecommons.org/licenses/by/3.0/)), which means you're welcome to share, remix, or use our content commercially. We just ask for attribution.
+
+    You are free to:
+    Share — copy and redistribute the material in any medium or format
+    Adapt — remix, transform, and build upon the material for any purpose, even commercially.
+    The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+    Under the following terms:
+    Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
+    No additional restrictions — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
+
+    Notices:
+    You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
+    No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
+
+
+Source code is under an [MIT License](http://opensource.org/licenses/MIT) (MIT):
+
+    Copyright (c) 2010-2014 by RailsBridge
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+
+