Merge branch 'master' into gh-pages
more figuring out
trying out this theme
added cname file
changed URL in config
Updated 2013-05-23-readability-feature-post.md
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
	_posts/2011-03-10-sample-post.md
	_posts/2013-08-16-code-highlighting-post.md
	_site/README.md
	_site/index.html
	cname
	theme-setup.md
figuring it out
changed title
testing
moved to root
moving page set to a folder for sub-pages
didn't need that page
Moving to Bootstrap

need to rapidly develop this site
added bs navigation
added bs js files

and added dropdown js to head
changed links to relative
updated nav script
change config site title
added open sans