I dont know why i have to commit
Merge branch 'master' of https://github.com/ST3tter/PA2-Doku

Conflicts:
	report.pdf