update Gemfile.lock for master merge

Author: jmartin-tech

Gemfile.lock

@@ -147,7 +147,7 @@ GEM
     filesize (0.1.1)
     fivemat (1.3.2)
     gherkin (4.0.0)
-    i18n (0.7.0)
+    i18n (0.8.0)
     jsobfu (0.4.2)
       rkelly-remix
     json (1.8.6)
@@ -202,9 +202,8 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.1)
     openvas-omp (0.0.4)
-    packetfu (1.1.11)
-      network_interface (~> 0.0)
-      pcaprub (~> 0.12)
+    packetfu (1.1.13.pre)
+      pcaprub
     patch_finder (1.0.2)
     pcaprub (0.12.4)
     pg (0.19.0)
@@ -235,7 +234,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    rb-readline (0.5.3)
+    rb-readline (0.5.4)
     recog (2.1.4)
       nokogiri
     redcarpet (3.4.0)
@@ -247,12 +246,12 @@ GEM
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.6)
+    rex-core (0.1.7)
     rex-encoder (0.1.2)
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.8)
+    rex-exploitation (0.1.10)
       jsobfu
       metasm
       rex-arch
@@ -304,20 +303,20 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     rubyntlm (0.6.1)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.13)
-    sshkey (1.8.0)
+    sshkey (1.9.0)
     thor (0.19.4)
     thread_safe (0.3.5)
     timecop (0.8.1)
@@ -350,4 +349,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.3
+   1.14.4