1
Merge branch 'May4' of https://github.com/frost52/sem8 into May4

Conflicts:
	chmv_k1/k_1.odt