add blog
Merge branch 'master' of github.com:flachware/blog

Conflicts:
	_site/assets/sass/blog.scss
	_site/assets/stylesheets/blog.css
	assets/sass/blog.scss
	assets/stylesheets/blog.css