merge
Merge branch 'master' of github.com:artss/dotfiles

Conflicts:
	root/.config/mc/panels.ini
Merge branch 'master' of github.com:artss/dotfiles