Merge branch 'docs_welcome'

author Mark Otto <otto@github.com>

Mon, 14 Oct 2013 06:19:17 +0000 (23:19 -0700)

committer Mark Otto <otto@github.com>

Mon, 14 Oct 2013 06:19:17 +0000 (23:19 -0700)
author Mark Otto <otto@github.com>
Mon, 14 Oct 2013 06:19:17 +0000 (23:19 -0700)
committer Mark Otto <otto@github.com>
Mon, 14 Oct 2013 06:19:17 +0000 (23:19 -0700)
diff --cc README.md
Simple merge
diff --cc _layouts/default.html
Simple merge
diff --cc docs-assets/css/docs.css
Simple merge
diff --cc getting-started.html
Simple merge
author	Mark Otto <otto@github.com>
	Mon, 14 Oct 2013 06:19:17 +0000 (23:19 -0700)
committer	Mark Otto <otto@github.com>
	Mon, 14 Oct 2013 06:19:17 +0000 (23:19 -0700)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
_layouts/default.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs-assets/css/docs.css	patch \|	diff1 \|	diff2 \|	blob \| history
getting-started.html	patch \|	diff1 \|	diff2 \|	blob \| history