Merge branch '2.0-wip'

Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less

1 files changed, 20 insertions, 0 deletions

diff --git a/docs/build/node_modules/hogan.js/package.json b/docs/build/node_modules/hogan.js/package.json
new file mode 100644
index 000000000..a09dede09
--- /dev/null
+++ b/docs/build/node_modules/hogan.js/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "hogan.js"
+  , "description": "A mustache compiler."
+  , "version": "1.0.5-dev"
+  , "keywords": ["mustache", "template"]
+  , "main": "./lib/hogan.js"
+  , "homepage": "http://twitter.github.com/hogan.js/"
+  , "author": "Twitter Inc."
+  , "repository": {
+    "type": "git"
+    , "url": "https://github.com/twitter/hogan.js.git"
+  }
+  , "licenses": [
+    { "type": "Apache-2.0"
+      , "url": "http://www.apache.org/licenses/LICENSE-2.0"
+    }
+  ]
+  , "devDependencies": { "uglify-js": "*" }
+  , "bin" : { "hulk" : "./bin/hulk" }
+}