лабораторная 3
Merge branch 'master' of https://github.com/zhelonkin/web

Conflicts:
	css/style.css
	lab31.php