Merge branch 'master' of https://github.com/lawrenz1337/webstudy

Conflicts:
	html/html_форма_регистрации.html
Signed-off-by: lawrenz1337 <dyachukmihail@gmail.com>
asd
Merge branch 'master' of https://github.com/lawrenz1337/webstudy