Merge branch 'hotfix/Version_bump_to_2.1.0' into develop

Author: DNZ\darius

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 CastleCSS
+Copyright (c) 2016 De Nieuwe Zaak
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,12 +2,11 @@
 ![CastleCSS logo @CastleCss.com](https://www.doordarius.nl/castlecss-logo-250.png)
 
 ## CastleCSS Framework
-The core files are part of the [Full CastleCSS Package](https://github.com/CastleCSS/castlecss)
-
+The core files are part of the [CastleCSS Package](https://github.com/CastleCSS/castlecss)
 
 ## How to install
-- Install via [NPM](https://www.npmjs.com/): ```npm install castlecss-core```
-- Require it in your own NPMJS package
+- Install via [npm](https://www.npmjs.com/): ```npm install castlecss-core```
+- Require it in your own npm package
 - Download or clone the package
 
 ## Updating files
@@ -16,39 +15,64 @@ CastleCSS is built so it's easy to update, you can just download make it your ow
 ```npm update castlecss-core```
 
 ## Documentation and examples
-You can find the documentation and examples at http://www.castlecss.com and [castlecss-docs](https://github.com/CastleCSS/castlecss-buttons)
+You can find the documentation and examples at http://www.castlecss.com and [castlecss-docs](https://github.com/CastleCSS/castlecss-docs)
+
+
+## Adjusting the variables
+Because of the unique update-able setup of CastleCSS you need a seperate variable file to overwrite the default CastleCSS variables. There are a few ways to do this: 
+
+- Use the [boilerplate](https://github.com/CastleCSS/castlecss-boilerplate/) which provides a variables.scss file
+- Copy variables.scss from /node_modules/castlecss-core/sass/variables.scss into your own scss folder and include it into your main.scss
+- Copy the example from the [documentation](http://castlecss.com/variables.html) into your own variables.scss and include it into your main.scss
 
-## Setup
-Your project should have a setup similair to this (included in the [Full CastleCSS Package](https://github.com/CastleCSS/castlecss)):
-With this you make sure your own variables overwrite the castle-core variables and your setup is still updatable.
+## Basic structure
+The basis structure for your website should look similar like this:
 
 ```
-| Your project/
+| Project directory/
 |
-|-- scss/ 
-| |-- /* Custom project specific scss files here */
-| |-- Main.scss
-| |
 |-- node_modules/
-| | 
-| | /*	CastleCSS files included automatically here */
-| | castlecss-core/
-| | castlecss-buttons/
-| | castlecss-etc ;)/
+| | -- castlecss-core/
+| | --castlecss-buttons/
+| | --castlecss-notifications/
+| |
+|-- scss/
+| |-- main.scss
+| |-- variables.scss
+| |
+|-- img/
+|-- dist/
+| |-- styles.min.css
+| |-- styles.min.map
+| |
+|-- index.html
+|-- Gruntfile.js
+|-- package.json
 ```
 
-### Main.scss
-Your main.scss should have a setup similair to this (included in the [Full CastleCSS Package](https://github.com/CastleCSS/castlecss)):
+### main.scss
+Your main.scss should have the following set-up:
 
 ```
-/*  core variable files */
+/* 	CastleCSS Core variables */
 @import "node_modules/castlecss-core/sass/variables";
-/*  Your own variables so they overwrite the core */
+
+/* 	Your variables */
 @import "variables";
-/*  rest of core files */
+
+/* 	Remaining Core files and other CastleCSS modules */
 @import "node_modules/castlecss-core/sass/main";
- 
-/*  Include your own files below this line
-    --------------------------------------
-*/
+@import "node_modules/castlecss-buttons/sass/main";
+@import "node_modules/castlecss-notifications/sass/main";
+
+/* Include your own files below this line
+   -------------------------------------- */
+
+
+
+/* --------------------------------------
+   Include your own files above this line */
+
+@import "node_modules/castlecss-core/sass/base/utility";
+@import "node_modules/castlecss-core/sass/base/utility_spacers";
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "castlecss-core",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "CastleCSS a SCSS framework with modular building blocks for the web",
   "main": "index.js",
   "scripts": {