update
Merge branch 'master' of https://github.com/YevgenK/vk-loc

Conflicts:
	some_file.txt