edited by 00 13-48

Conflicts:
	src/descr.txt