...
ge branch 'master' of https://github.com/carstenboehm/carstenboehm.github.io

Conflicts:
	_posts/2014-08-29-testing-prose.io.md