дневной апдейт
Merge branch 'master' of https://github.com/megatolya/dotfiles

Conflicts:
	init.sh