Merge branch 'develop' of https://github.com/codeRIT/brickhack.io into develop

Author: ww3637

Gemfile.lock

@@ -134,8 +134,8 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    puma (3.12.1)
-    rack (2.0.7)
+    puma (3.12.2)
+    rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)