blq blq
Merge branch 'master' of https://github.com/vkdimitrov/web_course

Conflicts:
	vali_me/index.php
Merge branch 'master' of https://github.com/vkdimitrov/web_course
4etv