...
Merge branch 'master' of https://github.com/kikinovak/lfs

Conflicts:
	NOTES.txt