emacs openline
Merge branch 'master' of github.com:utkukaratas/dotfiles

Conflicts:
	emacs.d/init.el