adding dotfiles
added l = ls al
asdf
Updating
Merge branch 'master' of https://github.com/dangirsh/dotfiles

Conflicts:
	.emacs
	.zshrc
work version
Merge branch 'master' of https://github.com/dangirsh/dotfiles

Conflicts:
	.emacs
Now using prelude config
magit and scroll keybindings
C-S-d now duplicates line or region (not just line)
Backup
Backup
backup
backup
backup