init.el
c style
Merge branch 'master' of github.com:einsteiner123/.emacs.d

Conflicts:
	init.el