Add .zshrc and Modify .emacs
Add .zshrc and Modify .emacs
To organize commit
Merge and resolve conflict