New text
Merge branch 'documentation' of https://github.com/roggenbrot42/rkptum2013 into documentation

Conflicts:
	doc/hijack.tex
	doc/main.tex