adding all directories
Merge branch 'master' of https://github.com/Felix11H/.emacs.d

Conflicts:
	init.el