resolving modifications to the same file from two different hosts
Merge branch 'master' of https://github.com/tox2ik/lfm

Conflicts:
	lfm.pl