Merge remote-tracking branch 'origin/gh-pages' into resources

.ruby-version

@@ -0,0 +1 @@
+2.0.0

.travis.yml

@@ -5,4 +5,4 @@ script: "./script/cibuild"
 #environment
 language: ruby
 rvm: 
-  - 1.9.3
+  - 2.0.0

Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
+ruby File.read('.ruby-version').strip
 
 gem "github-pages"

Gemfile.lock

@@ -9,7 +9,7 @@ GEM
       highline (~> 1.6.11)
     directory_watcher (1.4.1)
     fast-stemmer (1.0.2)
-    github-pages (1)
+    github-pages (4)
       RedCloth (= 4.2.9)
       jekyll (= 1.1.2)
       kramdown (= 1.0.2)

_config.yml

@@ -1,6 +1,6 @@
 title: ChooseALicense.com
 relative_permalinks: false
-markdown: redcarpet
+markdown: kramdown
 
 rules:
 

javascripts/app.js

@@ -1,9 +1,8 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.6.3
 (function() {
   var Choosealicense;
 
   Choosealicense = (function() {
-
     Choosealicense.prototype.flashAvailable = function() {
       if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) {
         return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));