PantherHackers · jeremiahlukus · Sep 6, 2017 · Sep 6, 2017 · Sep 6, 2017 · Sep 15, 2017
diff --git a/Gemfile b/Gemfile
@@ -38,6 +38,7 @@ gem 'whenever', '~> 0.9.7'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
+gem "bourbon"
 
 group :development, :production do
   gem 'listen', '~> 3.0.5'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -40,6 +40,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     arel (7.1.4)
+    bourbon (4.3.4)
+      sass (~> 3.4)
+      thor (~> 0.19)
     builder (3.2.3)
     byebug (9.0.6)
     chronic (0.10.2)
@@ -188,6 +191,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bourbon
   byebug
   gibbon (~> 3.0.1)
   jquery-rails
@@ -210,4 +214,4 @@ DEPENDENCIES
   whenever (~> 0.9.7)
 
 BUNDLED WITH
-   1.14.3
+   1.16.0.pre.2
diff --git a/app/assets/images/fullstack.png b/app/assets/images/fullstack.png
diff --git a/app/assets/images/gamedev.png b/app/assets/images/gamedev.png
diff --git a/app/assets/images/infosec.png b/app/assets/images/infosec.png
diff --git a/app/assets/images/solveforx.png b/app/assets/images/solveforx.png
diff --git a/app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss
@@ -10,6 +10,4 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require_tree .
- *= require_self
  */
diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss
@@ -1,3 +1,4 @@
 // Place all the styles related to the pages controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+