Dodao nesto
Merge branch 'master' of github.com:Martinsos/dotfiles
Popravio merge
Conflicts:
	emacs.d/ac-comphist.dat