swag
Merge branch 'lab2' of github.com:AwfulHaircut/kompen into lab2

Conflicts:
	rapp.tex