testing

Signed-off-by: lawrenz1337 <dyachukmihail@gmail.com>
Signed-off-by: Alexandra <malenkoechydoviwe@gmail.com>
Merge branch 'master' of https://github.com/webschool-pstu/test

Conflicts:
	hello.php