Changes:
vdfhfdsjh
Merge branch 'master' of github.com:ignacy/.emacs.d

Conflicts:
	elisp/basic-settings.el
	elisp/custom.el
	init.el