bearbeiten von abstraft
Merge branch 'master' of https://github.com/maxheld83/barjoke

Conflicts:
	touchingthefuture.tex