fixed init.el
fix init.el
Merge branch 'master' of github.com:Yousack/.emacs.d

Conflicts:
	init.el
edit .gitmodules for some new elisps