Merge branch 'clean2'

Conflicts:
	app/assets/stylesheets/static.css.scss
	app/controllers/static_controller.rb

4 files changed, 11 insertions, 17 deletions

diff --git a/app/assets/javascripts/static/homepage.js.coffee b/app/assets/javascripts/main/homepage.js.coffee
index e69de29..e69de29 100644
--- a/app/assets/javascripts/static/homepage.js.coffee
+++ b/app/assets/javascripts/main/homepage.js.coffee
diff --git a/app/assets/javascripts/static.js.coffee b/app/assets/javascripts/static.js.coffee
deleted file mode 100644
index 24f83d1..0000000
--- a/app/assets/javascripts/static.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
index a0d94c1..3859f53 100644
--- a/app/assets/stylesheets/main.css.scss
+++ b/app/assets/stylesheets/main.css.scss
@@ -1,3 +1,14 @@
 // Place all the styles related to the main controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.jumbotron {
+	background-color: #FFF;
+	box-shadow: 1px 1px 20px black;
+	width: 93%;
+
+	p {
+		line-height: 1.5em;
+	}
+
+}
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss
deleted file mode 100644
index 6732370..0000000
--- a/app/assets/stylesheets/static.css.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// Place all the styles related to the static controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
-
-.jumbotron {
-	background-color: #FFF;
-	box-shadow: 1px 1px 20px black;
-	width: 93%;
-	
-	p {
-		line-height: 1.5em;
-	}
-
-}