Merge branch 'master' of github.com:secure-systems-lab/ssl-site

Author: JustinCappos

Gemfile.lock

@@ -70,7 +70,7 @@ GEM
       sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.10.1)
+    json (2.10.2)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)