Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
updated css
Merge branch 'master' into gh-pages

Conflicts:
	_includes/themes/showcase/default.html
	_site/2013/09/16/goodyear-adaptor/index.html
	_site/2013/09/17/sheraton/index.html
	_site/archive.html
	_site/atom.xml
	_site/categories.html
	_site/index.html
	_site/pages.html
	_site/rss.xml
	_site/tags.html
	_theme_packages/showcase/_includes/themes/showcase/default.html
	_theme_packages/showcase/assets/themes/showcase/_sass/style.scss
css path
Merge branch 'gh-pages'