Adding updated gitconfig and sudo edit
Merge branch 'master' of github.com:sreeix/dotfiles

Conflicts:
	.emacs.d/lisp/setup-basics.el
	.gitconfig