init.el
Merge branch 'master' of https://github.com/zafartahirov/setup

Conflicts:
	dotfiles/.emacs.d/init.el
AUTOCOMMIT: Tue Aug 26 18:23:56 PDT 2014