added additional test post, updated theme
Merge branch 'master' into gh-pages

Conflicts:
	_site/assets/themes/showcase/css/style.css
	_site/atom.xml
	_site/rss.xml
	_site/tags.html
	_theme_packages/showcase/assets/themes/showcase/css/style.css
	assets/themes/showcase/css/style.css