Abstract
Merge branch 'master' of https://github.com/fbentele/TourLiveDoku

Conflicts:
	chapter/02abstract.tex