get rid of custom theme settings (stick to default theme)
Merge branch 'master' of github.com:OlafMerkert/.emacs.d

Resolved Conflicts:
	init.el