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

Conflicts:
	task3.php

Signed-off-by: lawrenz1337 <dyachukmihail@gmail.com>