hightlite line
Merge branch 'v2' of github.com:OlegKonope/emacs-starter-kit into v2

Conflicts:
	mak.el