Fixing merge conflicts after merging master

.gitignore

@@ -1,9 +1,9 @@
 # Specific files #
 ###################
-style-test.scss
+test.scss
 test.html
-style.css.map
-Gruntfile.js
+test.css.map
+test.css
 
 
 # Compiled source #

.npmignore

@@ -1,9 +1,6 @@
 .gitignore
 .npmignore
-.version
-settings.scss
-style.scss
-style-test.scss
-CHANGELOG.md
 bower.json
-test.html
+CHANGELOG.md
+test.html
+test.scss

.version

@@ -1 +1 @@
-1.9.1
+1.10.0

CHANGELOG.md

@@ -21,6 +21,10 @@
 - Make Button Group component optional (#77).
 - Apply [HTML5 Boilerplate](https://github.com/h5bp/html5-boilerplate) CSS updates where applicable (#43).
 
+=== 1.10.0 (April 25, 2015)
+
+- [Issue #108](https://github.com/chris-pearce/scally/issues/108) applied.
+
 === 1.9.1 (April 25, 2015)
 
 - [Issue #96](https://github.com/chris-pearce/scally/issues/96) applied, thanks

README.md

@@ -150,11 +150,11 @@ You can install Scally via the [**Download by zip**](https://github.com/chris-pe
 
 ## Setting up your master stylesheet
 
-Once you have installed Scally you will need to create a master Sass stylesheet called `style.scss`, that will live in the root of the folder where you keep all of your CSS.
+Once you have installed Scally you will need to create a master Sass stylesheet called `style.scss`, or whatever you want to name it, but for the purpose of this document `style.scss` will be the expected name. Then read the next section: [Master stylesheet overview](#master-stylesheet-overview).
 
-Once you have created this file grab everything [from here](style.scss) and paste it into your master stylesheet then read the next section: [Master stylesheet overview](#master-stylesheet-overview).
+This file will live at the root of the folder where you keep all of your CSS.
 
-This master stylesheet is what you will link too from your HTML head, once compiled that is, you can run a basic Sass watch command to compile your Sass, like this:
+This will be your master stylesheet and is what you will link too from your HTML head, once compiled that is, you can run a basic Sass watch command to compile your Sass, like this:
 
 ```
 sass --watch style.scss:style.css
@@ -174,23 +174,23 @@ This master stylesheet is designed to pull in everything from Scally–however o
 
 Your master stylesheet is split into three main sections:
 
-- [**Your settings.**](#your-settings) All of your project-specific settings in the form of Sass variables.
-- [**Scally framework.**](#scally-framework) The entire Scally framework including your overrides.
-- [**Your styles.**](#your-styles) All of the CSS you will write for your project.
+1. [**Your settings.**](#your-settings) All of your project-specific settings in the form of Sass variables.
+2. [**Scally framework.**](#scally-framework) The entire Scally framework including your overrides.
+3. [**Your styles.**](#your-styles) All of the CSS you will write for your project.
 
 **N.B.** it's imperative this order is maintained otherwise Scally won't work.
 
 ### Your settings
 
-This first section consists of one Sass partial:
+Create a new `.scss` file called `settings.scss` that will live in the root of the folder where you keep all of your CSS, along with your master Sass stylesheet: `style.scss`, and link to this file from `style.scss` like so:
 
 ```
 @import "settings";
 ```
 
-Which should live at the same level in your project file structure as your master stylesheet: `style.scss`, see an [example here](settings.scss).
+**This must come before the other two sections.**
 
-In this partial you will store all of your common project-specific settings, beyond what Scally offers. Typically you won't have many of these.
+In this file you will store all of your common project-specific settings, beyond what Scally offers. Typically you won't have many of these.
 
 Common project-specific settings might be adding more colours, so if you decide you need a new colour then in `settings.scss` you can create one like so:
 

bower.json

@@ -1,8 +1,7 @@
 {
   "name": "scally",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "homepage": "https://github.com/chris-pearce/scally",
-  "main": "style.css",
   "authors": [
     "Chris Pearce <[email protected]>",
     "Kate Levin <[email protected]>",
@@ -18,16 +17,13 @@
     "bem",
     "responsive"
   ],
-  "license": "The MIT License (MIT)",
+  "license": "Apache 2",
   "ignore": [
     ".gitignore",
-    "settings.scss",
-    "style.scss",
-    "style-test.scss",
+    ".npmignore",
     "CHANGELOG.md",
     "package.json",
-    "test.html",
-    ".version",
-    ".npmignore"
+    "test.scss",
+    "test.html"
   ]
 }

package.json

@@ -1,8 +1,7 @@
 {
   "name": "scally",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "Scally is a Sass, BEM, OOCSS, responsive ready, CSS framework that provides you with a solid foundation for building reusable UI's quickly",
-  "main": "style.css",
   "homepage": "https://github.com/chris-pearce/scally",
   "keywords": [
     "scally",
@@ -42,7 +41,7 @@
     "url": "https://github.com/chris-pearce/scally/issues"
   },
   "license": {
-    "type": "The MIT License (MIT)",
+    "type": "Apache 2",
     "url":  "https://github.com/chris-pearce/scally/blob/master/LICENSE"
   }
 }