modified:   velviens
	modified:   velviens~
Merge branch 'master' of https://github.com/EdmundsOzolins/fermarepo.git

Conflicts:
	velviens