Remove quarter/third columns, reconcile package

Author: bgantick

package.json

@@ -25,19 +25,11 @@
     "browserify": "^14.4.0",
     "browserify-shim": "^3.8.14",
     "concurrently": "^3.5.0",
-<<<<<<< HEAD
     "eslint": "^4.7.2",
     "eslint-config-punkave": "^1.0.10",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-node": "^5.2.0",
-=======
-    "eslint": "^4.2.0",
-    "eslint-config-punkave": "^1.0.8",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.1.0",
->>>>>>> master
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-standard": "^3.0.1",

src/sass/objects/_grid.scss

@@ -67,27 +67,3 @@
 }
 
 @include generate-columns(12);
-
-.o-column--third {
-  width: 100%;
-  @include media('>medium') {
-    width: (100% / 3);
-  }
-  &.o-column--break-sm {
-    @include media('>small') { /* stylelint-disable-line */
-      width: (100% / 3);
-    }
-  }
-}
-
-.o-column--quarter {
-  width: 100%;
-  @include media('>medium') {
-    width: (100% / 4);
-  }
-  &.o-column--break-sm {
-    @include media('>small') { /* stylelint-disable-line */
-      width: (100% / 4);
-    }
-  }
-}