html updates
Merge branch 'master' of https://github.com/schala09/blog

Conflicts:
	_posts/2014-02-23-on-writing.md