db
Merge branch 'master' of https://github.com/vladimir-tymishak/web_diploma

Conflicts:
	kroy.sql