Test git merge
Merge branch 'master' of https://github.com/Aquil0n/pet-projects

Conflicts:
	fsinspector/README.TXT
	fsinspector/README.md