wip
remove .quelpa-cache from .gitignore
Merge branch 'master' of github.com:ymln/dotfiles

Conflicts:
	.emacs
	.quelpa-cache