theme change final
Merge branch 'master' of github.com:NJBiddle/njbiddle

Conflicts:
	public/atom.xml
	public/blog/2014/02/08/hello-world/index.html
	public/blog/archives/index.html
	public/blog/categories/hello/atom.xml
	public/blog/categories/hello/index.html
	public/blog/categories/index.html
	public/blog/categories/sup/atom.xml
	public/blog/categories/sup/index.html
	public/blog/categories/test/atom.xml
	public/blog/categories/test/index.html
	public/index.html
	public/javascripts/twitter.js
	public/sitemap.xml
	public/stylesheets/screen.css
	sass/base/_layout.scss
	sass/base/_theme.scss
	sass/base/_typography.scss
	sass/base/_utilities.scss
	sass/custom/_fonts.scss
	sass/custom/_styles.scss
	sass/partials/_sharing.scss
	sass/partials/_syntax.scss
	sass/screen.scss
	source/_includes/archive_post.html
	source/_includes/article.html
	source/_includes/head.html
	source/_includes/navigation.html
	source/_includes/post/sharing.html
	source/_layouts/default.html
	source/_layouts/page.html
	source/_layouts/post.html
	source/index.html
	source/javascripts/twitter.js