my changes to 08 brench

Conflicts:
	src/desc.txt