Merge branch 'master' of github.com:johannesgunnar/johannesgunnar.github.com

Conflicts:
	blog/feed.xml