modified:   README.md
modified:   .gitignore
Merge branch 'master' of github.com:horosgrisa/Zshrc

Conflicts:
	.gitignore
Add _coffee
Add _extract
Add completions for npm
изменён:   completions.zsh
изменён:   functions.zsh
изменён:   highlighting.zsh