add color for ls
Merge branch 'master' of http://github.com/nag4/dotfiles

Conflicts:
	.zshrc
add line (meaningless)