Michael add

some desription
	modified:   velviens
	modified:   velviens~
Michael

dsf
Version 1.0
Merge https://github.com/EdmundsOzolins/fermarepo
Michael add

some desription
Merge branch 'master' of https://github.com/EdmundsOzolins/fermarepo.git

Conflicts:
	velviens
Merge branch 'master' of https://github.com/EdmundsOzolins/fermarepo into mans_zarins
Edmunds

Edmunds commits
Merge branch 'master' of https://github.com/EdmundsOzolins/fermarepo into mans_zarins