in company
Merge branch 'master' of github.com:ivan7702/emacs_setup

merge with company version