Backup
Merge branch 'master' of https://github.com/dangirsh/dotfiles

Conflicts:
	.emacs.d/ac-comphist.dat
	.emacs.d/projectile-bookmarks.eld
Merge branch 'master' of https://github.com/dangirsh/dotfiles

Conflicts:
	.emacs.d/ac-comphist.dat
	.emacs.d/projectile-bookmarks.eld