First commit
Merge branch 'master' of https://github.com/6pz-diit-diplom/files

Conflicts:
	db/README.txt