Commit from idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	3Files.txt
	README.txt
Commit from idea
Merge branch 'master' of https://github.com/orm4/obnosovHomeTest

Conflicts:
	3Files.txt
	README.txt