local p
Merge branch 'master' of https://github.com/margjakob/margjakob.github.io

Conflicts:
	_posts/2014-09-25-virtualbox.md