Merge branch 'master' of github.com:alex-glv/emacs-settings

Conflicts:
	.gitignore
Merge branch 'master' of github.com:alex-glv/emacs-settings

Conflicts:
	.gitignore