Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	component.json

diff --cc component.json
index 9ab1fc7,cf50b43..af46e49
--- 1/component.json
--- 2/component.json
+++ b/component.json
@@@ -1,15 -1,16 +1,21 @@@
  {
-   "author": "Thomas Park",
-   "name": "bootswatch",
-   "description": "Bootswatch is a collection of free themes for Twitter Bootstrap.",
-   "version": "2.3.0+1",
-   "homepage": "http://bootswatch.com/",
-   "repository": {
-     "type": "git",
-     "url": "git://github.com/thomaspark/bootswatch.git"
-   },
-   "main": "",
-   "dependencies": {
-     "bootstrap": "~2.3.0"
-   }
+       "name": "bootswatch",
+       "description": "Themes for Bootstrap",
+       "homepage": "http://bootswatch.com",
+       "author": "Thomas Park",
 -      "version": "v2.3.0+1",
++      "version": "2.3.0+1",
++      "repository": {
++              "type": "git",
++              "url": "git://github.com/thomaspark/bootswatch.git"
++      },
+       "dependencies": {
 -              "jquery": "~1.9.0"
++              "jquery": "~1.9.0",
++              "bootstrap": "~2.3.0"
+       },
+       "licenses": [
+               {
+                       "type": "Apache-2.0",
+                       "url": "http://www.apache.org/licenses/LICENSE-2.0"
+               }
+       ]
  }